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

turn niflags into a define named NIFLAGS

Browse Source
This commit is contained in:
Daniel Stenberg 2004-03-10 15:24:56 +00:00
parent d29590f583
commit 85838a8966
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ftp.c
View File

@ -1122,9 +1122,9 @@ CURLcode ftp_use_port(struct connectdata *conn)
struct sockaddr *sa=(struct sockaddr *)&ss; struct sockaddr *sa=(struct sockaddr *)&ss;
#ifdef NI_WITHSCOPEID #ifdef NI_WITHSCOPEID
const int niflags = NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID; #define NIFLAGS NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID
#else #else
const int niflags = NI_NUMERICHOST | NI_NUMERICSERV; #define NIFLAGS NI_NUMERICHOST | NI_NUMERICSERV
#endif #endif
unsigned char *ap; unsigned char *ap;
unsigned char *pp; unsigned char *pp;
@ -1146,7 +1146,7 @@ CURLcode ftp_use_port(struct connectdata *conn)
} }
rc = getnameinfo((struct sockaddr *)&ss, sslen, hbuf, sizeof(hbuf), NULL, 0, rc = getnameinfo((struct sockaddr *)&ss, sslen, hbuf, sizeof(hbuf), NULL, 0,
niflags); NIFLAGS);
if(rc) { if(rc) {
failf(data, "getnameinfo() returned %d\n", rc); failf(data, "getnameinfo() returned %d\n", rc);
return CURLE_FTP_PORT_FAILED; return CURLE_FTP_PORT_FAILED;
@ -1236,7 +1236,8 @@ CURLcode ftp_use_port(struct connectdata *conn)
if (eprtaf < 0) if (eprtaf < 0)
continue; continue;
if (getnameinfo((struct sockaddr *)&ss, sslen, if (getnameinfo((struct sockaddr *)&ss, sslen,
portmsgbuf, sizeof(portmsgbuf), tmp, sizeof(tmp), niflags)) portmsgbuf, sizeof(portmsgbuf), tmp, sizeof(tmp),
NIFLAGS))
continue; continue;
/* do not transmit IPv6 scope identifier to the wire */ /* do not transmit IPv6 scope identifier to the wire */