aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2000-08-24 14:26:06 +0000
committerDaniel Stenberg <daniel@haxx.se>2000-08-24 14:26:06 +0000
commit400ca043c73fb2e2db6d62b47183873b5a5966cd (patch)
treef1f3c782a51f46123a9d47eb3fe8c0972861d23a /lib
parentd4ffc5ef32df229c35d22213ed42890847b3db7b (diff)
inet_ntoa_r() usage made more portable
Diffstat (limited to 'lib')
-rw-r--r--lib/ftp.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/ftp.c b/lib/ftp.c
index 9017c20e2..db64c63c6 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -38,14 +38,14 @@
* ------------------------------------------------------------
****************************************************************************/
+#include "setup.h"
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
-#include "setup.h"
-
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -680,7 +680,10 @@ CURLcode _ftp(struct connectdata *conn)
unsigned short ip[5];
(void) memcpy(&in.s_addr, *h->h_addr_list, sizeof (in.s_addr));
#if defined (HAVE_INET_NTOA_R)
- sscanf( inet_ntoa_r(in, ntoa_buf, sizeof(ntoa_buf)), "%hu.%hu.%hu.%hu",
+ /* ignore the return code from inet_ntoa_r() as it is int or
+ char * depending on system */
+ inet_ntoa_r(in, ntoa_buf, sizeof(ntoa_buf));
+ sscanf( ntoa_buf, "%hu.%hu.%hu.%hu",
&ip[0], &ip[1], &ip[2], &ip[3]);
#else
sscanf( inet_ntoa(in), "%hu.%hu.%hu.%hu",
@@ -815,7 +818,7 @@ CURLcode _ftp(struct connectdata *conn)
infof(data, "Connecting to %s (%s) port %u\n",
answer?answer->h_name:newhost,
#if defined(HAVE_INET_NTOA_R)
- ip_addr = inet_ntoa_r(in, ntoa_buf, sizeof(ntoa_buf)),
+ inet_ntoa_r(in, ip_addr=ntoa_buf, sizeof(ntoa_buf)),
#else
ip_addr = inet_ntoa(in),
#endif