[commits] r13658 - in /fsf/trunk/libc: ChangeLog NEWS conform/data/netdb.h-data inet/getnameinfo.c resolv/netdb.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Mon May  2 00:03:08 2011
New Revision: 13658

Log:
Import glibc-mainline for 2011-05-02

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/conform/data/netdb.h-data
    fsf/trunk/libc/inet/getnameinfo.c
    fsf/trunk/libc/resolv/netdb.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Mon May  2 00:03:08 2011
@@ -1,3 +1,11 @@
+2011-04-30  Bruno Haible  <bruno@xxxxxxxxx>
+
+	[BZ #12717]
+	* conform/data/netdb.h-data (getnameinfo): Make POSIX compliant.
+	* resolv/netdb.h (getnameinfo): Change type of flags parameter
+	to 'int'.
+	* inet/getnameinfo.c (getnameinfo): Likewise.
+
 2011-04-29  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	* grp/initgroups.c (internal_getgrouplist): Prefer initgroups setting

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Mon May  2 00:03:08 2011
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2011-4-22
+GNU C Library NEWS -- history of user-visible changes.  2011-5-1
 Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -19,7 +19,7 @@
 * The following bugs are resolved with this release:
 
   11724, 12420, 12445, 12454, 12460, 12469, 12489, 12509, 12510, 12518, 12583,
-  12587, 12597, 12631, 12650, 12653, 12655, 12685
+  12587, 12597, 12631, 12650, 12653, 12655, 12685, 12717
 
 Version 2.13
 

Modified: fsf/trunk/libc/conform/data/netdb.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/netdb.h-data (original)
+++ fsf/trunk/libc/conform/data/netdb.h-data Mon May  2 00:03:08 2011
@@ -89,7 +89,7 @@
 function {struct hostent*} gethostbyaddr (const void*, socklen_t, int)
 function {struct hostent*} gethostbyname (const char*)
 function {struct hostent*} gethostent (void)
-function int getnameinfo (const struct sockaddr*, socklen_t, char*, socklen_t, char*, socklen_t, unsigned)
+function int getnameinfo (const struct sockaddr*, socklen_t, char*, socklen_t, char*, socklen_t, int)
 function {struct netent*} getnetbyaddr (uint32_t, int)
 function {struct netent*} getnetbyname (const char*)
 function {struct netent*} getnetent (void)

Modified: fsf/trunk/libc/inet/getnameinfo.c
==============================================================================
--- fsf/trunk/libc/inet/getnameinfo.c (original)
+++ fsf/trunk/libc/inet/getnameinfo.c Mon May  2 00:03:08 2011
@@ -159,7 +159,7 @@
 int
 getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
 	     socklen_t hostlen, char *serv, socklen_t servlen,
-	     unsigned int flags)
+	     int flags)
 {
   int serrno = errno;
   int tmpbuflen = 1024;
@@ -385,7 +385,7 @@
 	break;
 
       default:
-        return EAI_FAMILY;
+	return EAI_FAMILY;
     }
 
   if (serv && (servlen > 0))

Modified: fsf/trunk/libc/resolv/netdb.h
==============================================================================
--- fsf/trunk/libc/resolv/netdb.h (original)
+++ fsf/trunk/libc/resolv/netdb.h Mon May  2 00:03:08 2011
@@ -1,4 +1,4 @@
-  /* Copyright (C) 1996-2004, 2009, 2010 Free Software Foundation, Inc.
+  /* Copyright (C) 1996-2004, 2009, 2010, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -679,7 +679,7 @@
 extern int getnameinfo (__const struct sockaddr *__restrict __sa,
 			socklen_t __salen, char *__restrict __host,
 			socklen_t __hostlen, char *__restrict __serv,
-			socklen_t __servlen, unsigned int __flags);
+			socklen_t __servlen, int __flags);
 #endif	/* POSIX */
 
 #ifdef __USE_GNU