Undo last changes

diff --git a/ares/ares.h b/ares/ares.h
index 6a5b4efabc066dbca43c2e81107fc2487080c835..7f76112f7141bff9ebac0fa2a3b71f59fc31dd63 100644 (file)
--- 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 33704b11df14ba145205042127e9c52b508ea0e1..d13b11d47ffa4ececa8be0965f146670bf3c06e0 100644 (file)
--- 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;

diff --git a/lib/ftp.c b/lib/ftp.c
index 49dd5ae4f1b344850244f0406c10bd5eb06f084a..6c35ce215a68a8276a9307594d1163753fa65cf9 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -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 f9be23c22c80fa0ff6d5d780e1e43c517ad456b8..3baf8284b41141939835c2dc9bebf9eedde53e82 100644 (file)
--- 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 edfbd54f4217f80c07f87085035ac2f68771c2ef..04ebaedee871780f4dbade1abad811804e3c0156 100644 (file)
--- 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)