admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

set_tcp_* functions should be static since they are not used anywhere else.

Browse Source 
set_tcp_sockopt in particular conflicts with libnfs's function of the same
name and prevents a a program from statically linking against both libnfs and
libiscsi.

Similar fix should also go into libnfs.
This commit is contained in:
Mike Cui
2015-01-05 09:24:01 -08:00
parent 52d9d84f9c
commit 2284a8763c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/socket.c
View File

@@ -129,7 +129,7 @@ static void set_nonblocking(int fd)
#endif #endif
} }
int set_tcp_sockopt(int sockfd, int optname, int value) static int set_tcp_sockopt(int sockfd, int optname, int value)
{ {
int level; int level;
@@ -151,7 +151,7 @@ int set_tcp_sockopt(int sockfd, int optname, int value)
#define TCP_USER_TIMEOUT 18 #define TCP_USER_TIMEOUT 18
#endif #endif
int set_tcp_user_timeout(struct iscsi_context *iscsi) static int set_tcp_user_timeout(struct iscsi_context *iscsi)
{ {
if (set_tcp_sockopt(iscsi->fd, TCP_USER_TIMEOUT, iscsi->tcp_user_timeout) != 0) { if (set_tcp_sockopt(iscsi->fd, TCP_USER_TIMEOUT, iscsi->tcp_user_timeout) != 0) {
iscsi_set_error(iscsi, "TCP: Failed to set tcp user timeout. Error %s(%d)", strerror(errno), errno); iscsi_set_error(iscsi, "TCP: Failed to set tcp user timeout. Error %s(%d)", strerror(errno), errno);
@@ -165,7 +165,7 @@ int set_tcp_user_timeout(struct iscsi_context *iscsi)
#define TCP_SYNCNT 7 #define TCP_SYNCNT 7
#endif #endif
int set_tcp_syncnt(struct iscsi_context *iscsi) static int set_tcp_syncnt(struct iscsi_context *iscsi)
{ {
if (set_tcp_sockopt(iscsi->fd, TCP_SYNCNT, iscsi->tcp_syncnt) != 0) { if (set_tcp_sockopt(iscsi->fd, TCP_SYNCNT, iscsi->tcp_syncnt) != 0) {
iscsi_set_error(iscsi, "TCP: Failed to set tcp syn retries. Error %s(%d)", strerror(errno), errno); iscsi_set_error(iscsi, "TCP: Failed to set tcp syn retries. Error %s(%d)", strerror(errno), errno);