Browse Source

no need for hidden inet_ntoa_r

it is reused within the same file, solve it through a static function

Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Peter S. Mazinger 14 years ago
parent
commit
b9e58bace8
2 changed files with 3 additions and 4 deletions
  1. 0 1
      include/arpa/inet.h
  2. 3 3
      libc/inet/addr.c

+ 0 - 1
include/arpa/inet.h

@@ -60,7 +60,6 @@ libc_hidden_proto(inet_ntoa)
 #ifdef __UCLIBC__
 /* Recursion-safe flavor */
 extern char *inet_ntoa_r (struct in_addr __in, char *__buf) __THROW;
-libc_hidden_proto(inet_ntoa_r)
 #endif
 
 /* Convert from presentation format of an Internet number in buffer

+ 3 - 3
libc/inet/addr.c

@@ -114,7 +114,7 @@ libc_hidden_def(inet_addr)
 
 #define INET_NTOA_MAX_LEN	16	/* max 12 digits + 3 '.'s + 1 nul */
 
-char *inet_ntoa_r(struct in_addr in, char buf[INET_NTOA_MAX_LEN])
+static char *__inet_ntoa_r(struct in_addr in, char buf[INET_NTOA_MAX_LEN])
 {
 	in_addr_t addr = ntohl(in.s_addr);
 	int i;
@@ -133,12 +133,12 @@ char *inet_ntoa_r(struct in_addr in, char buf[INET_NTOA_MAX_LEN])
 
 	return p+1;
 }
-libc_hidden_def(inet_ntoa_r)
+strong_alias(__inet_ntoa_r,inet_ntoa_r)
 
 char *inet_ntoa(struct in_addr in)
 {
 	static char buf[INET_NTOA_MAX_LEN];
-	return inet_ntoa_r(in, buf);
+	return __inet_ntoa_r(in, buf);
 }
 libc_hidden_def(inet_ntoa)
 #endif