svn commit: trunk/uClibc: include libc/inet

[vda at uclibc.org]

Author: vda
Date: 2008-12-01 01:41:41 -0800 (Mon, 01 Dec 2008)
New Revision: 24201

Log:
gethostbyname can use gethostbyname2, saving one nearly 0.5k static buffer

    text           data     bss     dec     hex filename
-     45              0     480     525     20d libc/inet/gethostbyname.o
+     18              0       0      18      12 libc/inet/gethostbyname.o



Modified:
   trunk/uClibc/include/netdb.h
   trunk/uClibc/libc/inet/resolv.c


Changeset:
Modified: trunk/uClibc/include/netdb.h
===================================================================
--- trunk/uClibc/include/netdb.h	2008-12-01 09:08:04 UTC (rev 24200)
+++ trunk/uClibc/include/netdb.h	2008-12-01 09:41:41 UTC (rev 24201)
@@ -159,6 +159,7 @@
    or due to the implementation it is a cancellation point and
    therefore not marked with __THROW.  */
 extern struct hostent *gethostbyname2 (__const char *__name, int __af);
+libc_hidden_proto(gethostbyname2)
 
 /* Reentrant versions of the functions above.  The additional
    arguments specify a buffer of BUFLEN starting at BUF.  The last

Modified: trunk/uClibc/libc/inet/resolv.c
===================================================================
--- trunk/uClibc/libc/inet/resolv.c	2008-12-01 09:08:04 UTC (rev 24200)
+++ trunk/uClibc/libc/inet/resolv.c	2008-12-01 09:41:41 UTC (rev 24201)
@@ -2052,10 +2052,10 @@
 	if (family == AF_INET)
 		return gethostbyname_r(name, result_buf, buf, buflen, result, h_errnop);
 
+	*result = NULL;
 	if (family != AF_INET6)
 		return EINVAL;
 
-	*result = NULL;
 	if (!name)
 		return EINVAL;
 
@@ -2064,7 +2064,7 @@
 		int old_errno = errno;	/* Save the old errno and reset errno */
 		__set_errno(0);			/* to check for missing /etc/hosts. */
 
-		i = __get_hosts_byname_r(name, family, result_buf,
+		i = __get_hosts_byname_r(name, AF_INET6 /*family*/, result_buf,
 				buf, buflen, result, h_errnop);
 		if (i == NETDB_SUCCESS) {
 			__set_errno(old_errno);
@@ -2431,40 +2431,45 @@
 #endif
 
 
-#ifdef L_gethostbyname
+#ifdef L_gethostbyname2
 
-struct hostent *gethostbyname(const char *name)
+struct hostent *gethostbyname2(const char *name, int family)
 {
+#ifndef __UCLIBC_HAS_IPV6__
+	return family == AF_INET ? gethostbyname(name) : (struct hostent*)NULL;
+#else
 	static struct hostent h;
-	static char buf[sizeof(struct in_addr) +
-			sizeof(struct in_addr *) * 2 +
+	static char buf[sizeof(struct in6_addr) +
+			sizeof(struct in6_addr *) * 2 +
 			sizeof(char *)*ALIAS_DIM + 384/*namebuffer*/ + 32/* margin */];
 	struct hostent *hp;
 
-	gethostbyname_r(name, &h, buf, sizeof(buf), &hp, &h_errno);
+	gethostbyname2_r(name, family, &h, buf, sizeof(buf), &hp, &h_errno);
 	return hp;
+#endif
 }
-libc_hidden_def(gethostbyname)
+libc_hidden_def(gethostbyname2)
 #endif
 
 
-#ifdef L_gethostbyname2
+#ifdef L_gethostbyname
 
-struct hostent *gethostbyname2(const char *name, int family)
+struct hostent *gethostbyname(const char *name)
 {
 #ifndef __UCLIBC_HAS_IPV6__
-	return family == AF_INET ? gethostbyname(name) : (struct hostent*)NULL;
-#else
 	static struct hostent h;
-	static char buf[sizeof(struct in6_addr) +
-			sizeof(struct in6_addr *) * 2 +
+	static char buf[sizeof(struct in_addr) +
+			sizeof(struct in_addr *) * 2 +
 			sizeof(char *)*ALIAS_DIM + 384/*namebuffer*/ + 32/* margin */];
 	struct hostent *hp;
 
-	gethostbyname2_r(name, family, &h, buf, sizeof(buf), &hp, &h_errno);
+	gethostbyname_r(name, &h, buf, sizeof(buf), &hp, &h_errno);
 	return hp;
+#else
+	return gethostbyname2(name, AF_INET);
 #endif
 }
+libc_hidden_def(gethostbyname)
 #endif