diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/connect.c | 7 | ||||
| -rw-r--r-- | lib/ftp.c | 4 | ||||
| -rw-r--r-- | lib/hostip.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/lib/connect.c b/lib/connect.c index 9f8efdbd6..06d2464ae 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -193,7 +193,7 @@ static CURLcode bindlocal(struct connectdata *conn, #ifdef HAVE_INET_NTOA #ifndef INADDR_NONE -#define INADDR_NONE (unsigned long) ~0 +#define INADDR_NONE (in_addr_t) ~0 #endif struct SessionHandle *data = conn->data; @@ -207,7 +207,7 @@ static CURLcode bindlocal(struct connectdata *conn, char *hostdataptr=NULL; size_t size; char myhost[256] = ""; - unsigned long in; + in_addr_t in; if(Curl_if2ip(data->set.device, myhost, sizeof(myhost))) { h = Curl_getaddrinfo(data, myhost, 0, &hostdataptr); @@ -236,7 +236,8 @@ static CURLcode bindlocal(struct connectdata *conn, infof(data, "We bind local end to %s\n", myhost); - if ( (in=inet_addr(myhost)) != INADDR_NONE ) { + in=inet_addr(myhost); + if (INADDR_NONE != in) { if ( h ) { memset((char *)&sa, 0, sizeof(sa)); @@ -1211,10 +1211,10 @@ CURLcode ftp_use_port(struct connectdata *conn) if(bind(portsock, (struct sockaddr *)&sa, size) >= 0) { /* we succeeded to bind */ struct sockaddr_in add; - size = sizeof(add); + socklen_t socksize = sizeof(add); if(getsockname(portsock, (struct sockaddr *) &add, - (socklen_t *)&size)<0) { + &socksize)<0) { failf(data, "getsockname() failed"); return CURLE_FTP_PORT_FAILED; } diff --git a/lib/hostip.c b/lib/hostip.c index f3a3ccaa5..86faa117a 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -265,7 +265,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data, char **bufp) { struct hostent *h = NULL; - unsigned long in; + in_addr_t in; int ret; /* this variable is unused on several platforms but used on some */ #define CURL_NAMELOOKUP_SIZE 9000 |