diff options
| -rw-r--r-- | lib/connect.c | 3 | ||||
| -rw-r--r-- | lib/ftp.c | 2 | ||||
| -rw-r--r-- | lib/if2ip.h | 8 | ||||
| -rw-r--r-- | lib/strerror.c | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/lib/connect.c b/lib/connect.c index 261ab08d8..f402ede77 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -364,6 +364,9 @@ static CURLcode bindlocal(struct connectdata *conn, return CURLE_OK; } /* end of device selection support */ +#else + (void)conn; + (void)sockfd; #endif /* end of HAVE_INET_NTOA */ return CURLE_HTTP_PORT_FAILED; @@ -1062,7 +1062,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn, /* we set the secondary socket variable to this for now, it is only so that the cleanup function will close it in case we fail before the true secondary stuff is made */ - if(-1 != conn->sock[SECONDARYSOCKET]) + if(CURL_SOCKET_BAD != conn->sock[SECONDARYSOCKET]) sclose(conn->sock[SECONDARYSOCKET]); conn->sock[SECONDARYSOCKET] = portsock; diff --git a/lib/if2ip.h b/lib/if2ip.h index 45a180531..ddb73ee8b 100644 --- a/lib/if2ip.h +++ b/lib/if2ip.h @@ -24,12 +24,8 @@ ***************************************************************************/ #include "setup.h" -#if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN32__) && \ - !defined(__riscos__) && !defined(__INTERIX) -extern char *Curl_if2ip(const char *interface, char *buf, int buf_size); -#else -#define Curl_if2ip(a,b,c) NULL -#endif +extern char *Curl_if2ip(const char *interf, char *buf, int buf_size); + #ifdef __INTERIX /* Nedelcho Stanev's work-around for SFU 3.0 */ struct ifreq { diff --git a/lib/strerror.c b/lib/strerror.c index 0f0c0fff2..85baa635d 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -346,7 +346,7 @@ curl_share_strerror(CURLSHcode error) static const char * get_winsock_error (int err, char *buf, size_t len) { - char *p; + const char *p; #ifndef CURL_DISABLE_VERBOSE_STRINGS switch (err) { |