Commit b15f3bb9 authored by Yang Tse's avatar Yang Tse
Browse files

Undo last changes

parent 998e8cba

ares/ares.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

ares/ares_getnameinfo.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

lib/ftp.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

lib/hostip.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

lib/hostip6.c

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ 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)