moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

Fix compiler warning and compatibility issue with the type of the parameter used in getnameinfo() to receive the length of the sockaddr struct.

Browse Source
This commit is contained in:
Yang Tse 2005-12-11 12:03:01 +00:00
parent b4113360f6
commit 36485e56ed
5 changed files with 6 additions and 6 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,
socklen_t salen, int flags, ares_nameinfo_callback callback, size_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, socklen_t salen, void ares_getnameinfo(ares_channel channel, const struct sockaddr *sa, size_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;

2
lib/ftp.c
View File

@ -780,7 +780,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
*/ */
struct Curl_sockaddr_storage ss; struct Curl_sockaddr_storage ss;
struct addrinfo *res, *ai; struct addrinfo *res, *ai;
socklen_t sslen; size_t sslen;
char hbuf[NI_MAXHOST]; char hbuf[NI_MAXHOST];
struct sockaddr *sa=(struct sockaddr *)&ss; struct sockaddr *sa=(struct sockaddr *)&ss;
unsigned char *ap; unsigned char *ap;

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, socklen_t salen, int curl_dogetnameinfo(const struct sockaddr *sa, size_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, socklen_t salen, int curl_dogetnameinfo(const struct sockaddr *sa, size_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 = (int)(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)