[Glibc-bsd-commits] r4425 - trunk/glibc-ports/kfreebsd

[Aurelien Jarno]

Author: aurel32
Date: 2013-05-10 03:01:13 +0000 (Fri, 10 May 2013)
New Revision: 4425

Modified:
   trunk/glibc-ports/kfreebsd/bind.c
   trunk/glibc-ports/kfreebsd/connect.c
   trunk/glibc-ports/kfreebsd/sa_len.c
   trunk/glibc-ports/kfreebsd/sendto.c
Log:
Remove use of INTDEF/INTUSE in socket, following upstream commit 03277f8fe13d0dde136ee98be5dc54362ec9af17


Modified: trunk/glibc-ports/kfreebsd/bind.c
===================================================================
--- trunk/glibc-ports/kfreebsd/bind.c	2013-05-09 20:36:43 UTC (rev 4424)
+++ trunk/glibc-ports/kfreebsd/bind.c	2013-05-10 03:01:13 UTC (rev 4425)
@@ -26,7 +26,7 @@
    there. The code below emulate this behaviour. */
 
 extern int __libc_sa_len (sa_family_t __af);
-extern int __libc_sa_len_internal (sa_family_t __af);
+libc_hidden_proto (__libc_sa_len)
 
 extern int __syscall_bind (int fd, __CONST_SOCKADDR_ARG addr,
 			   socklen_t addrlen) __THROW;
@@ -42,11 +42,7 @@
 {
   socklen_t new_addrlen;
 
-#ifndef NOT_IN_libc
-  new_addrlen = INTUSE(__libc_sa_len) ((addr.__sockaddr__)->sa_family);
-#else
   new_addrlen = __libc_sa_len ((addr.__sockaddr__)->sa_family);
-#endif
 
   /* Only allow a smaller size, otherwise it could lead to
     stack corruption */

Modified: trunk/glibc-ports/kfreebsd/connect.c
===================================================================
--- trunk/glibc-ports/kfreebsd/connect.c	2013-05-09 20:36:43 UTC (rev 4424)
+++ trunk/glibc-ports/kfreebsd/connect.c	2013-05-10 03:01:13 UTC (rev 4425)
@@ -27,7 +27,7 @@
    there. The code below emulate this behaviour.  */
 
 extern int __libc_sa_len (sa_family_t __af);
-extern int __libc_sa_len_internal (sa_family_t __af);
+libc_hidden_proto (__libc_sa_len)
 
 extern int __syscall_connect (int fd, __CONST_SOCKADDR_ARG addr,
 			      socklen_t addrlen);
@@ -43,11 +43,7 @@
 {
   socklen_t new_addrlen;
 
-#ifndef NOT_IN_libc
-  new_addrlen = INTUSE(__libc_sa_len) ((addr.__sockaddr__)->sa_family);
-#else
   new_addrlen = __libc_sa_len ((addr.__sockaddr__)->sa_family);
-#endif
 
   /* Only allow a smaller size, otherwise it could lead to
     stack corruption */
@@ -64,6 +60,6 @@
   return result;
 }
 
-strong_alias (__libc_connect, __connect_internal)
 weak_alias (__libc_connect, __connect)
 weak_alias (__libc_connect, connect)
+libc_hidden_weak (__connect)

Modified: trunk/glibc-ports/kfreebsd/sa_len.c
===================================================================
--- trunk/glibc-ports/kfreebsd/sa_len.c	2013-05-09 20:36:43 UTC (rev 4424)
+++ trunk/glibc-ports/kfreebsd/sa_len.c	2013-05-10 03:01:13 UTC (rev 4425)
@@ -23,6 +23,9 @@
 #include <netipx/ipx.h>
 #include <sys/un.h>
 
+extern int __libc_sa_len (sa_family_t __af);
+libc_hidden_proto (__libc_sa_len)
+
 int
 __libc_sa_len (sa_family_t af)
 {
@@ -41,4 +44,4 @@
     }
   return 0;
 }
-INTDEF(__libc_sa_len)
+libc_hidden_def (__libc_sa_len)

Modified: trunk/glibc-ports/kfreebsd/sendto.c
===================================================================
--- trunk/glibc-ports/kfreebsd/sendto.c	2013-05-09 20:36:43 UTC (rev 4424)
+++ trunk/glibc-ports/kfreebsd/sendto.c	2013-05-10 03:01:13 UTC (rev 4425)
@@ -27,7 +27,7 @@
    there. The code below emulate this behaviour.  */
 
 extern int __libc_sa_len (sa_family_t __af);
-extern int __libc_sa_len_internal (sa_family_t __af);
+libc_hidden_proto (__libc_sa_len)
 
 extern ssize_t __syscall_sendto (int fd, __const void * buf,
 		                 size_t n, int flags,
@@ -46,18 +46,14 @@
   socklen_t new_addrlen;
 
   if (addr.__sockaddr__)
-  {
-#ifndef NOT_IN_libc
-  new_addrlen = INTUSE(__libc_sa_len) ((addr.__sockaddr__)->sa_family);
-#else
-  new_addrlen = __libc_sa_len ((addr.__sockaddr__)->sa_family);
-#endif
+    {
+      new_addrlen = __libc_sa_len ((addr.__sockaddr__)->sa_family);
 
-  /* Only allow a smaller size, otherwise it could lead to
-    stack corruption */
-  if ((new_addrlen != 0) && (new_addrlen < addrlen))
-    addrlen = new_addrlen;
-  }
+      /* Only allow a smaller size, otherwise it could lead to
+        stack corruption */
+      if ((new_addrlen != 0) && (new_addrlen < addrlen))
+	addrlen = new_addrlen;
+    }
 
   /* We pass 6 arguments.  */
   if (SINGLE_THREAD_P)