ntoa() and inet_ntoa_r() no longer used

24 files changed, 10 insertions, 157 deletions

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 8cb9a7425..7be6ccf91 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -14,7 +14,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c	\
 HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h	\
   progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h	\
   if2ip.h speedcheck.h urldata.h curl_ldap.h ssluse.h escape.h telnet.h	\
-  getinfo.h strequal.h krb4.h memdebug.h inet_ntoa_r.h http_chunks.h	\
+  getinfo.h strequal.h krb4.h memdebug.h http_chunks.h	                \
   strtok.h connect.h llist.h hash.h content_encoding.h share.h		\
   curl_md5.h http_digest.h http_negotiate.h http_ntlm.h inet_pton.h	\
   strtoofft.h strerror.h inet_ntop.h curlx.h memory.h setup.h		\
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 5e3e861bb..a2aa1623f 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -457,7 +457,6 @@ endif
 	@echo $(DL)#define HAVE_GETPROTOBYNAME 1$(DL) >> $@
 	@echo $(DL)#define HAVE_GMTIME_R 1$(DL) >> $@
 	@echo $(DL)#define HAVE_INET_ADDR 1$(DL) >> $@
-	@echo $(DL)#define HAVE_INET_NTOA 1$(DL) >> $@
 	@echo $(DL)#define HAVE_LL 1$(DL) >> $@
 	@echo $(DL)#define HAVE_LOCALE_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_LOCALTIME_R 1$(DL) >> $@
diff --git a/lib/amigaos.h b/lib/amigaos.h
index ed3baf50e..649c05f2e 100644
--- a/lib/amigaos.h
+++ b/lib/amigaos.h
@@ -40,9 +40,6 @@
 #ifndef select
 # define select(args...) WaitSelect( args, NULL)
 #endif
-#ifndef inet_ntoa
-# define inet_ntoa(x)    Inet_NtoA( x ## .s_addr)
-#endif
 #ifndef ioctl
 # define ioctl(a,b,c,d)  IoctlSocket( (LONG)a, (ULONG)b, (char*)c)
 #endif
diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h
index 86d9daa41..f8dc3a374 100644
--- a/lib/config-amigaos.h
+++ b/lib/config-amigaos.h
@@ -28,7 +28,6 @@
 #define HAVE_ARPA_INET_H 1
 #define HAVE_GETHOSTBYADDR 1
 #define HAVE_INET_ADDR 1
-#define HAVE_INET_NTOA 1
 #define HAVE_INTTYPES_H 1
 #define HAVE_IOCTLSOCKET_CASE 1
 #define HAVE_LIBCRYPTO 1
diff --git a/lib/config-mac.h b/lib/config-mac.h
index c08a302aa..2f4c2fb02 100644
--- a/lib/config-mac.h
+++ b/lib/config-mac.h
@@ -31,7 +31,6 @@
 #define HAVE_ALARM              1
 #define HAVE_STRDUP             1
 #define HAVE_UTIME              1
-#define HAVE_INET_NTOA          1
 #define HAVE_SETVBUF            1
 #define HAVE_STRFTIME           1
 #define HAVE_INET_ADDR          1
diff --git a/lib/config-os400.h b/lib/config-os400.h
index f49a159c9..647893d99 100644
--- a/lib/config-os400.h
+++ b/lib/config-os400.h
@@ -33,12 +33,6 @@
 /* Define if you have the gethostbyname_r() function with 6 arguments */
 #undef HAVE_GETHOSTBYNAME_R_6
 
-/* Define if you have the inet_ntoa_r function declared. */
-#define HAVE_INET_NTOA_R_DECL
-
-/* Define if the inet_ntoa_r function returns an int. */
-#define HAVE_INT_INET_NTOA_R
-
 /* Define if you need the _REENTRANT define for some functions */
 #undef NEED_REENTRANT
 
@@ -127,12 +121,6 @@
 /* Define if you have the `inet_addr' function. */
 #define HAVE_INET_ADDR
 
-/* Define if you have the `inet_ntoa' function. */
-#define HAVE_INET_NTOA
-
-/* Define if you have the `inet_ntoa_r' function. */
-#define HAVE_INET_NTOA_R
-
 /* Define if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H
 
diff --git a/lib/config-riscos.h b/lib/config-riscos.h
index e3a1c15fc..f863f634e 100644
--- a/lib/config-riscos.h
+++ b/lib/config-riscos.h
@@ -29,9 +29,6 @@
 /* Define if you have the gethostbyname_r() function with 6 arguments */
 #undef HAVE_GETHOSTBYNAME_R_6
 
-/* Define if you have the inet_ntoa_r function declared. */
-#undef HAVE_INET_NTOA_R_DECL
-
 /* Define if you need the _REENTRANT define for some functions */
 #undef NEED_REENTRANT
 
@@ -122,12 +119,6 @@
 /* Define if you have the `inet_addr' function. */
 #undef HAVE_INET_ADDR
 
-/* Define if you have the `inet_ntoa' function. */
-#undef HAVE_INET_NTOA
-
-/* Define if you have the `inet_ntoa_r' function. */
-#undef HAVE_INET_NTOA_R
-
 /* Define if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H
 
diff --git a/lib/config-symbian.h b/lib/config-symbian.h
index 1bd34a298..3f0ddf158 100644
--- a/lib/config-symbian.h
+++ b/lib/config-symbian.h
@@ -222,15 +222,6 @@
 /* Define to 1 if you have the `inet_addr' function. */
 /*#define HAVE_INET_ADDR 1*/
 
-/* Define to 1 if you have the `inet_ntoa' function. */
-/*#define HAVE_INET_NTOA 1*/
-
-/* Define to 1 if you have the `inet_ntoa_r' function. */
-/* #undef HAVE_INET_NTOA_R */
-
-/* inet_ntoa_r() is declared */
-/* #undef HAVE_INET_NTOA_R_DECL */
-
 /* Define to 1 if you have the `inet_pton' function. */
 #define HAVE_INET_PTON 1
 
diff --git a/lib/config-tpf.h b/lib/config-tpf.h
index ff441e59e..35231976a 100644
--- a/lib/config-tpf.h
+++ b/lib/config-tpf.h
@@ -208,15 +208,6 @@
 /* Define to 1 if you have the `inet_addr' function. */
 #define HAVE_INET_ADDR 1
 
-/* Define to 1 if you have the `inet_ntoa' function. */
-#define HAVE_INET_NTOA 1
-
-/* Define to 1 if you have the `inet_ntoa_r' function. */
-/* #undef HAVE_INET_NTOA_R */
-
-/* inet_ntoa_r() is declared */
-/* #undef HAVE_INET_NTOA_R_DECL */
-
 /* Define to 1 if you have the `inet_pton' function. */
 /* #undef HAVE_INET_PTON */
 
diff --git a/lib/config-win32.h b/lib/config-win32.h
index c987f41ca..0d10a04bb 100644
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -157,9 +157,6 @@
 /* Define if you have the inet_addr function.  */
 #define HAVE_INET_ADDR 1
 
-/* Define if you have the inet_ntoa function.  */
-#define HAVE_INET_NTOA 1
-
 /* Define if you have the ioctlsocket function.  */
 #define HAVE_IOCTLSOCKET 1
 
diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h
index 84a567883..b770a4472 100644
--- a/lib/config-win32ce.h
+++ b/lib/config-win32ce.h
@@ -145,9 +145,6 @@
 /* Define if you have the inet_addr function.  */
 #define HAVE_INET_ADDR 1
 
-/* Define if you have the inet_ntoa function.  */
-#define HAVE_INET_NTOA 1
-
 /* Define if you have the ioctlsocket function.  */
 #define HAVE_IOCTLSOCKET 1
 
diff --git a/lib/formdata.c b/lib/formdata.c
index e017cb7f3..62409ec41 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -56,14 +56,14 @@ Content-Type: application/octet-stream
 vlue for PTRCONTENTS + CONTENTSLENGTH + CONTENTTYPE
 (or you might see v^@lue at the start)
 
-Content-Disposition: form-data; name="FILE1_+_CONTENTTYPE"; filename="inet_ntoa_r.h"
+Content-Disposition: form-data; name="FILE1_+_CONTENTTYPE"; filename="formdata.h"
 Content-Type: text/html
 ...
 
 Content-Disposition: form-data; name="FILE1_+_FILE2"
 Content-Type: multipart/mixed, boundary=curlz1s0dkticx49MV1KGcYP5cvfSsz
 ...
-Content-Disposition: attachment; filename="inet_ntoa_r.h"
+Content-Disposition: attachment; filename="formdata.h"
 Content-Type: application/octet-stream
 ...
 Content-Disposition: attachment; filename="Makefile.b32"
@@ -73,13 +73,13 @@ Content-Type: application/octet-stream
 Content-Disposition: form-data; name="FILE1_+_FILE2_+_FILE3"
 Content-Type: multipart/mixed, boundary=curlirkYPmPwu6FrJ1vJ1u1BmtIufh1
 ...
-Content-Disposition: attachment; filename="inet_ntoa_r.h"
+Content-Disposition: attachment; filename="formdata.h"
 Content-Type: application/octet-stream
 ...
 Content-Disposition: attachment; filename="Makefile.b32"
 Content-Type: application/octet-stream
 ...
-Content-Disposition: attachment; filename="inet_ntoa_r.h"
+Content-Disposition: attachment; filename="formdata.h"
 Content-Type: application/octet-stream
 ...
 
@@ -87,13 +87,13 @@ Content-Type: application/octet-stream
 Content-Disposition: form-data; name="ARRAY: FILE1_+_FILE2_+_FILE3"
 Content-Type: multipart/mixed, boundary=curlirkYPmPwu6FrJ1vJ1u1BmtIufh1
 ...
-Content-Disposition: attachment; filename="inet_ntoa_r.h"
+Content-Disposition: attachment; filename="formdata.h"
 Content-Type: application/octet-stream
 ...
 Content-Disposition: attachment; filename="Makefile.b32"
 Content-Type: application/octet-stream
 ...
-Content-Disposition: attachment; filename="inet_ntoa_r.h"
+Content-Disposition: attachment; filename="formdata.h"
 Content-Type: application/octet-stream
 ...
 
@@ -1562,7 +1562,7 @@ int main(int argc, argv_item_t argv[])
   char value4[] = "value for simple PTRCONTENTS";
   char value5[] = "value for PTRCONTENTS + CONTENTSLENGTH";
   char value6[] = "value for PTRCONTENTS + CONTENTSLENGTH + CONTENTTYPE";
-  char value7[] = "inet_ntoa_r.h";
+  char value7[] = "formdata.h";
   char value8[] = "Makefile.b32";
   char type2[] = "image/gif";
   char type6[] = "text/plain";
diff --git a/lib/ftp.c b/lib/ftp.c
index 4021c500b..7f1e51205 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -84,7 +84,6 @@
 #include "sslgen.h"
 #include "connect.h"
 #include "strerror.h"
-#include "memory.h"
 #include "inet_ntop.h"
 #include "select.h"
 #include "parsedate.h" /* for the week day and month names */
@@ -92,17 +91,12 @@
 #include "multiif.h"
 #include "url.h"
 
-#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
-#include "inet_ntoa_r.h"
-#endif
-
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
+#include "memory.h"
 /* The last #include file should be: */
-#ifdef CURLDEBUG
 #include "memdebug.h"
-#endif
 
 #ifdef HAVE_NI_WITHSCOPEID
 #define NIFLAGS NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID
diff --git a/lib/hostares.c b/lib/hostares.c
index e283bbffc..293634573 100644
--- a/lib/hostares.c
+++ b/lib/hostares.c
@@ -80,12 +80,7 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
-#include "inet_ntoa_r.h"
-#endif
-
 #include "memory.h"
-
 /* The last #include file should be: */
 #include "memdebug.h"
 
diff --git a/lib/hostasyn.c b/lib/hostasyn.c
index b7fff8939..bcf8a5400 100644
--- a/lib/hostasyn.c
+++ b/lib/hostasyn.c
@@ -71,10 +71,6 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
-#include "inet_ntoa_r.h"
-#endif
-
 #include "memory.h"
 /* The last #include file should be: */
 #include "memdebug.h"
diff --git a/lib/hostip.c b/lib/hostip.c
index f223889dd..722c4b525 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -72,10 +72,6 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
-#include "inet_ntoa_r.h"
-#endif
-
 #include "memory.h"
 /* The last #include file should be: */
 #include "memdebug.h"
diff --git a/lib/hostip4.c b/lib/hostip4.c
index a7d94c87a..392e40b20 100644
--- a/lib/hostip4.c
+++ b/lib/hostip4.c
@@ -73,10 +73,6 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
-#include "inet_ntoa_r.h"
-#endif
-
 #include "memory.h"
 /* The last #include file should be: */
 #include "memdebug.h"
diff --git a/lib/hostip6.c b/lib/hostip6.c
index 0d63f7224..2f9857f43 100644
--- a/lib/hostip6.c
+++ b/lib/hostip6.c
@@ -73,10 +73,6 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
-#include "inet_ntoa_r.h"
-#endif
-
 #include "memory.h"
 /* The last #include file should be: */
 #include "memdebug.h"
diff --git a/lib/hostsyn.c b/lib/hostsyn.c
index 83d062e6d..650906b9c 100644
--- a/lib/hostsyn.c
+++ b/lib/hostsyn.c
@@ -71,10 +71,6 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
-#include "inet_ntoa_r.h"
-#endif
-
 #include "memory.h"
 /* The last #include file should be: */
 #include "memdebug.h"
diff --git a/lib/inet_ntoa_r.h b/lib/inet_ntoa_r.h
deleted file mode 100644
index c6c9bd895..000000000
--- a/lib/inet_ntoa_r.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef __INET_NTOA_R_H
-#define __INET_NTOA_R_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- * $Id$
- ***************************************************************************/
-
-#include "setup.h"
-
-#ifdef HAVE_INET_NTOA_R_2_ARGS
-/*
- * uClibc 0.9.26 (at least) doesn't define this prototype. The buffer
- * must be at least 16 characters long.
- */
-char *inet_ntoa_r(const struct in_addr in, char buffer[]);
-
-#else
-/*
- * My solaris 5.6 system running gcc 2.8.1 does *not* have this prototype
- * in any system include file! Isn't that weird?
- */
-char *inet_ntoa_r(const struct in_addr in, char *buffer, int buflen);
-
-#endif
-
-#endif
diff --git a/lib/setup-os400.h b/lib/setup-os400.h
index bf899759e..5efa6863b 100644
--- a/lib/setup-os400.h
+++ b/lib/setup-os400.h
@@ -59,12 +59,6 @@ extern int      Curl_getnameinfo_a(const struct sockaddr * sa, socklen_t salen,
 
 /* SSL wrappers. */
 
-extern int      Curl_inet_ntoa_r_a(struct in_addr internet_address,
-                                   char * output_buffer,
-                                   int output_buffer_length);
-#define inet_ntoa_r             Curl_inet_ntoa_r_a
-
-
 extern int      Curl_SSL_Init_Application_a(SSLInitApp * init_app);
 #define SSL_Init_Application    Curl_SSL_Init_Application_a
 
diff --git a/lib/setup.h b/lib/setup.h
index df253662f..66ddd38cb 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -455,10 +455,6 @@ int netware_init(void);
 
 #define LIBIDN_REQUIRED_VERSION "0.4.1"
 
-#ifdef __UCLIBC__
-#define HAVE_INET_NTOA_R_2_ARGS 1
-#endif
-
 #if defined(USE_GNUTLS) || defined(USE_SSLEAY) || defined(USE_NSS) || defined(USE_QSOSSL)
 #define USE_SSL    /* SSL support has been enabled */
 #endif
diff --git a/lib/ssh.c b/lib/ssh.c
index 17efff13b..b968dcf36 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -98,23 +98,17 @@
 #include "sslgen.h"
 #include "connect.h"
 #include "strerror.h"
-#include "memory.h"
 #include "inet_ntop.h"
 #include "parsedate.h" /* for the week day and month names */
 #include "sockaddr.h" /* required for Curl_sockaddr_storage */
 #include "multiif.h"
 
-#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
-#include "inet_ntoa_r.h"
-#endif
-
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
+#include "memory.h"
 /* The last #include file should be: */
-#ifdef CURLDEBUG
 #include "memdebug.h"
-#endif
 
 #ifndef PATH_MAX
 #define PATH_MAX 1024 /* just an extra precaution since there are systems that
diff --git a/lib/url.c b/lib/url.c
index 352ec20c7..53e2bf7e0 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -138,15 +138,10 @@ void idn_free (void *ptr); /* prototype from idn-free.h, not provided by
 #include "http_ntlm.h"
 #include "socks.h"
 
-#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
-#include "inet_ntoa_r.h"
-#endif
-
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "memory.h"
-
 /* The last #include file should be: */
 #include "memdebug.h"