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

Fix compiler warnings

Browse Source 
These patch fixes 3 compiler warnings introduce by my recent patches.
This commit is contained in:
Peter Lieven
2012-10-19 23:48:04 +02:00
parent ad9cd56b2d
commit 236aaa011f
3 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/connect.c
View File

@@ -24,6 +24,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <time.h>
#include "slist.h" #include "slist.h"
#include "iscsi.h" #include "iscsi.h"
#include "iscsi-private.h" #include "iscsi-private.h"

2
lib/init.c
View File

@@ -280,7 +280,7 @@ iscsi_set_error(struct iscsi_context *iscsi, const char *error_string, ...)
va_end(ap); va_end(ap);
DPRINTF(iscsi,1,str); DPRINTF(iscsi,1,"%s",str);
} }
void void

58
lib/socket.c
View File

@@ -58,6 +58,34 @@ static void set_nonblocking(int fd)
#endif #endif
} }
#ifndef TCP_USER_TIMEOUT
#define TCP_USER_TIMEOUT 18
#endif
int set_tcp_user_timeout(struct iscsi_context *iscsi)
{
int level, value;
#if defined(__FreeBSD__) || defined(__sun)
struct protoent *buf;
if ((buf = getprotobyname("tcp")) != NULL)
level = buf->p_proto;
else
return -1;
#else
level = SOL_TCP;
#endif
value = iscsi->tcp_user_timeout;
if (setsockopt(iscsi->fd, level, TCP_USER_TIMEOUT, &value, sizeof(value)) != 0) {
iscsi_set_error(iscsi, "TCP: Failed to set tcp user timeout. Error %s(%d)", strerror(errno), errno);
return -1;
}
DPRINTF(iscsi,3,"TCP_USER_TIMEOUT set to %d",value);
return 0;
}
int int
iscsi_connect_async(struct iscsi_context *iscsi, const char *portal, iscsi_connect_async(struct iscsi_context *iscsi, const char *portal,
iscsi_command_cb cb, void *private_data) iscsi_command_cb cb, void *private_data)
@@ -178,7 +206,7 @@ iscsi_connect_async(struct iscsi_context *iscsi, const char *portal,
freeaddrinfo(ai); freeaddrinfo(ai);
if (iscsi->connected_portal) free(iscsi->connected_portal); if (iscsi->connected_portal) free(discard_const(iscsi->connected_portal));
iscsi->connected_portal=strdup(portal); iscsi->connected_portal=strdup(portal);
return 0; return 0;
@@ -529,34 +557,6 @@ iscsi_free_iscsi_inqueue(struct iscsi_in_pdu *inqueue)
} }
} }
#ifndef TCP_USER_TIMEOUT
#define TCP_USER_TIMEOUT 18
#endif
int set_tcp_user_timeout(struct iscsi_context *iscsi)
{
int level, value;
#if defined(__FreeBSD__) || defined(__sun)
struct protoent *buf;
if ((buf = getprotobyname("tcp")) != NULL)
level = buf->p_proto;
else
return -1;
#else
level = SOL_TCP;
#endif
value = iscsi->tcp_user_timeout;
if (setsockopt(iscsi->fd, level, TCP_USER_TIMEOUT, &value, sizeof(value)) != 0) {
iscsi_set_error(iscsi, "TCP: Failed to set tcp user timeout. Error %s(%d)", strerror(errno), errno);
return -1;
}
DPRINTF(iscsi,3,"TCP_USER_TIMEOUT set to %d",value);
return 0;
}
void iscsi_set_tcp_user_timeout(struct iscsi_context *iscsi, int timeout_ms) void iscsi_set_tcp_user_timeout(struct iscsi_context *iscsi, int timeout_ms)
{ {
iscsi->tcp_user_timeout=timeout_ms; iscsi->tcp_user_timeout=timeout_ms;