moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

Undo last changes

This commit is contained in:
Yang Tse 2005-12-11 23:37:58 +00:00
parent 998e8cba19
commit b15f3bb969
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ares/ares.h
View File

@ -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, void ares_gethostbyaddr(ares_channel channel, const void *addr, int addrlen,
int family, ares_host_callback callback, void *arg); int family, ares_host_callback callback, void *arg);
void ares_getnameinfo(ares_channel channel, const struct sockaddr *sa, 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); void *arg);
int ares_fds(ares_channel channel, fd_set *read_fds, fd_set *write_fds); int ares_fds(ares_channel channel, fd_set *read_fds, fd_set *write_fds);
struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv, struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv,

2
ares/ares_getnameinfo.c
View File

@ -78,7 +78,7 @@ static void append_scopeid(struct sockaddr_in6 *addr6, unsigned int scopeid,
#endif #endif
static char *ares_striendstr(const char *s1, const char *s2); 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) int flags, ares_nameinfo_callback callback, void *arg)
{ {
struct sockaddr_in *addr = NULL; struct sockaddr_in *addr = NULL;

4
lib/ftp.c
View File

@ -812,7 +812,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
return CURLE_FTP_PORT_FAILED; 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); 0, NIFLAGS);
if(rc) { if(rc) {
failf(data, "getnameinfo() returned %d\n", 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 (EPRT == fcmd) {
if (eprtaf < 0) if (eprtaf < 0)
continue; continue;
if (getnameinfo((struct sockaddr *)&ss, (size_t)sslen, if (getnameinfo((struct sockaddr *)&ss, sslen,
portmsgbuf, sizeof(portmsgbuf), tmp, sizeof(tmp), portmsgbuf, sizeof(portmsgbuf), tmp, sizeof(tmp),
NIFLAGS)) NIFLAGS))
continue; continue;

2
lib/hostip.h
View File

@ -191,7 +191,7 @@ int curl_dogetaddrinfo(char *hostname, char *service,
struct addrinfo *hints, struct addrinfo *hints,
struct addrinfo **result, struct addrinfo **result,
int line, const char *source); 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 *host, size_t hostlen,
char *serv, size_t servlen, int flags, char *serv, size_t servlen, int flags,
int line, const char *source); int line, const char *source);

4
lib/hostip6.c
View File

@ -138,12 +138,12 @@ int curl_dogetaddrinfo(char *hostname, char *service,
return res; 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 *host, size_t hostlen,
char *serv, size_t servlen, int flags, char *serv, size_t servlen, int flags,
int line, const char *source) 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) { if(0 == res) {
/* success */ /* success */
if(logfile) if(logfile)