Fixed some compiler warnings I should have noticed before.

3 files changed, 7 insertions, 10 deletions

diff --git a/lib/if2ip.c b/lib/if2ip.c
index 966032506..70e93634c 100644
--- a/lib/if2ip.c
+++ b/lib/if2ip.c
@@ -69,6 +69,7 @@
 #include <inet.h>
 #endif
 
+#include "inet_ntop.h"
 #include "memory.h"
 
 /* The last #include file should be: */
diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c
index 293723a7e..6e4b38b1d 100644
--- a/lib/inet_ntop.c
+++ b/lib/inet_ntop.c
@@ -54,17 +54,13 @@
  *  - uses no statics
  *  - takes a u_char* not an in_addr as input
  */
-static const char *inet_ntop4 (const u_char *src, char *dst, size_t size)
+static char *inet_ntop4 (const u_char *src, char *dst, size_t size)
 {
 #if defined(HAVE_INET_NTOA_R_2_ARGS)
   const char *ptr;
-  size_t len;
   curlassert(size >= 16);
   ptr = inet_ntoa_r(*(struct in_addr*)src, dst);
-  len = strlen(ptr);
-  memmove(dst, ptr, len);
-  dst[len] = 0;
-  return dst;
+  return (char *)memmove(dst, ptr, strlen(ptr)+1);
 
 #elif defined(HAVE_INET_NTOA_R)
   return inet_ntoa_r(*(struct in_addr*)src, dst, size);
@@ -85,7 +81,7 @@ static const char *inet_ntop4 (const u_char *src, char *dst, size_t size)
 /*
  * Convert IPv6 binary address into presentation (printable) format.
  */
-static const char *inet_ntop6 (const u_char *src, char *dst, size_t size)
+static char *inet_ntop6 (const u_char *src, char *dst, size_t size)
 {
   /*
    * Note that int32_t and int16_t need only be "at least" large enough
@@ -189,10 +185,10 @@ static const char *inet_ntop6 (const u_char *src, char *dst, size_t size)
 /*
  * Convert a network format address to presentation format.
  *
- * Returns pointer to presentation format address (`dst'),
+ * Returns pointer to presentation format address (`buf'),
  * Returns NULL on error (see errno).
  */
-const char *Curl_inet_ntop(int af, const void *src, char *buf, size_t size)
+char *Curl_inet_ntop(int af, const void *src, char *buf, size_t size)
 {
   switch (af) {
   case AF_INET:
diff --git a/lib/inet_ntop.h b/lib/inet_ntop.h
index 5948a120b..eb66ae7fb 100644
--- a/lib/inet_ntop.h
+++ b/lib/inet_ntop.h
@@ -31,7 +31,7 @@
 #include <arpa/inet.h>
 #endif
 #else
-const char *Curl_inet_ntop(int af, const void *addr, char *buf, size_t size);
+char *Curl_inet_ntop(int af, const void *addr, char *buf, size_t size);
 #endif
 
 #endif /* __INET_NTOP_H */