Commit 6d53bd2c authored by deuce's avatar deuce
Browse files

Fix warnings.

parent aed0d321
......@@ -1317,7 +1317,9 @@ int DLLCALL iniGetSocketOptions(str_list_t list, const char* section, SOCKET soc
int type=0; // Assignment is to silence Valgrind.
LINGER linger;
socket_option_t* socket_options=getSocketOptionList();
#ifdef IPPROTO_IPV6
union xp_sockaddr addr;
#endif
len=sizeof(type);
if((result=getsockopt(sock, SOL_SOCKET, SO_TYPE, (char*)&type, &len)) != 0) {
......
......@@ -24,7 +24,7 @@ struct xpms_set* DLLCALL xpms_create(unsigned int retries, unsigned int wait_sec
void DLLCALL xpms_destroy(struct xpms_set *xpms_set, void (*sock_destroy)(SOCKET, void *), void *cbdata)
{
int i;
size_t i;
if(!xpms_set)
return;
......@@ -237,7 +237,7 @@ SOCKET DLLCALL xpms_accept(struct xpms_set *xpms_set, union xp_sockaddr * addr,
socklen_t * addrlen, unsigned int timeout, void **cb_data)
{
fd_set read_fs;
int i;
size_t i;
struct timeval tv;
struct timeval *tvp;
SOCKET max_sock=0;
......
......@@ -438,7 +438,7 @@ union xp_sockaddr* DLLCALL inet_ptoaddr(char *addr_str, union xp_sockaddr *addr,
const char* DLLCALL inet_addrtop(union xp_sockaddr *addr, char *dest, size_t size)
{
#ifdef _WIN32
if(getnameinfo(addr, xp_sockaddr_len(addr), dest, size, NULL, 0, NI_NUMERICHOST))
if(getnameinfo(&addr->addr, xp_sockaddr_len(addr), dest, size, NULL, 0, NI_NUMERICHOST))
strncpy(dest, "<Unable to convert address>", size);
return dest;
#else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment