diff options
| -rw-r--r-- | ares/ares.h | 2 | ||||
| -rw-r--r-- | ares/ares_getnameinfo.c | 2 | ||||
| -rw-r--r-- | lib/ftp.c | 4 | ||||
| -rw-r--r-- | lib/hostip.h | 2 | ||||
| -rw-r--r-- | lib/hostip6.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/ares/ares.h b/ares/ares.h index 6a5b4efab..7f76112f7 100644 --- a/ares/ares.h +++ b/ares/ares.h @@ -172,7 +172,7 @@ void ares_gethostbyname(ares_channel channel, const char *name, int family, void ares_gethostbyaddr(ares_channel channel, const void *addr, int addrlen, int family, ares_host_callback callback, void *arg); void ares_getnameinfo(ares_channel channel, const struct sockaddr *sa, - size_t salen, int flags, ares_nameinfo_callback callback, + socklen_t salen, int flags, ares_nameinfo_callback callback, void *arg); int ares_fds(ares_channel channel, fd_set *read_fds, fd_set *write_fds); struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv, diff --git a/ares/ares_getnameinfo.c b/ares/ares_getnameinfo.c index 33704b11d..d13b11d47 100644 --- a/ares/ares_getnameinfo.c +++ b/ares/ares_getnameinfo.c @@ -78,7 +78,7 @@ static void append_scopeid(struct sockaddr_in6 *addr6, unsigned int scopeid, #endif static char *ares_striendstr(const char *s1, const char *s2); -void ares_getnameinfo(ares_channel channel, const struct sockaddr *sa, size_t salen, +void ares_getnameinfo(ares_channel channel, const struct sockaddr *sa, socklen_t salen, int flags, ares_nameinfo_callback callback, void *arg) { struct sockaddr_in *addr = NULL; @@ -812,7 +812,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn, return CURLE_FTP_PORT_FAILED; } - rc = getnameinfo((struct sockaddr *)&ss, (size_t)sslen, hbuf, sizeof(hbuf), NULL, + rc = getnameinfo((struct sockaddr *)&ss, sslen, hbuf, sizeof(hbuf), NULL, 0, NIFLAGS); if(rc) { failf(data, "getnameinfo() returned %d\n", rc); @@ -921,7 +921,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn, if (EPRT == fcmd) { if (eprtaf < 0) continue; - if (getnameinfo((struct sockaddr *)&ss, (size_t)sslen, + if (getnameinfo((struct sockaddr *)&ss, sslen, portmsgbuf, sizeof(portmsgbuf), tmp, sizeof(tmp), NIFLAGS)) continue; diff --git a/lib/hostip.h b/lib/hostip.h index f9be23c22..3baf8284b 100644 --- a/lib/hostip.h +++ b/lib/hostip.h @@ -191,7 +191,7 @@ int curl_dogetaddrinfo(char *hostname, char *service, struct addrinfo *hints, struct addrinfo **result, int line, const char *source); -int curl_dogetnameinfo(const struct sockaddr *sa, size_t salen, +int curl_dogetnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags, int line, const char *source); diff --git a/lib/hostip6.c b/lib/hostip6.c index edfbd54f4..04ebaedee 100644 --- a/lib/hostip6.c +++ b/lib/hostip6.c @@ -138,12 +138,12 @@ int curl_dogetaddrinfo(char *hostname, char *service, return res; } -int curl_dogetnameinfo(const struct sockaddr *sa, size_t salen, +int curl_dogetnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags, int line, const char *source) { - int res = (getnameinfo)(sa, salen, host, hostlen, serv, servlen, flags); + int res=(getnameinfo)(sa, salen, host, hostlen, serv, servlen, flags); if(0 == res) { /* success */ if(logfile) |