From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 10 Mar 2004 15:24:56 +0000 (+0000)
Subject: turn niflags into a define named NIFLAGS
X-Git-Tag: curl-7_11_1~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85838a8966692831cf7d3744b34f5a04260366fd;p=thirdparty%2Fcurl.git

turn niflags into a define named NIFLAGS
---

diff --git a/lib/ftp.c b/lib/ftp.c
index 950ec0eaca..14b9df39ac 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -1122,9 +1122,9 @@ CURLcode ftp_use_port(struct connectdata *conn)
 
   struct sockaddr *sa=(struct sockaddr *)&ss;
 #ifdef NI_WITHSCOPEID
-  const int niflags = NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID;
+#define NIFLAGS NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID
 #else
-  const int niflags = NI_NUMERICHOST | NI_NUMERICSERV;
+#define NIFLAGS NI_NUMERICHOST | NI_NUMERICSERV
 #endif
   unsigned char *ap;
   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,
-                   niflags);
+                   NIFLAGS);
   if(rc) {
     failf(data, "getnameinfo() returned %d\n", rc);
     return CURLE_FTP_PORT_FAILED;
@@ -1236,7 +1236,8 @@ CURLcode ftp_use_port(struct connectdata *conn)
       if (eprtaf < 0)
         continue;
       if (getnameinfo((struct sockaddr *)&ss, sslen,
-                      portmsgbuf, sizeof(portmsgbuf), tmp, sizeof(tmp), niflags))
+                      portmsgbuf, sizeof(portmsgbuf), tmp, sizeof(tmp),
+                      NIFLAGS))
         continue;
 
       /* do not transmit IPv6 scope identifier to the wire */