[git commit] socketcalls.c: prefer using recvfrom in recv and sendto in send

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Fri Jun 15 12:00:30 UTC 2012


commit: http://git.uclibc.org/uClibc/commit/?id=7bc58308afc072fd5cff0e952b13493c55b300de
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

Make socketcall the last alternative.

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 libc/inet/socketcalls.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libc/inet/socketcalls.c b/libc/inet/socketcalls.c
index 7ee3670..5b6ced3 100644
--- a/libc/inet/socketcalls.c
+++ b/libc/inet/socketcalls.c
@@ -267,6 +267,11 @@ ssize_t __libc_recv(int sockfd, __ptr_t buffer, size_t len, int flags)
 	return result;
 #endif
 }
+#elif defined(__NR_recvfrom)
+ssize_t __libc_recv(int sockfd, __ptr_t buffer, size_t len, int flags)
+{
+	return (recvfrom(sockfd, buffer, len, flags, NULL, NULL));
+}
 #elif defined(__NR_socketcall)
 /* recv, recvfrom added by bir7 at leland.stanford.edu */
 ssize_t __libc_recv(int sockfd, __ptr_t buffer, size_t len, int flags)
@@ -288,11 +293,6 @@ ssize_t __libc_recv(int sockfd, __ptr_t buffer, size_t len, int flags)
 	return result;
 #endif
 }
-#elif defined(__NR_recvfrom)
-ssize_t __libc_recv(int sockfd, __ptr_t buffer, size_t len, int flags)
-{
-	return (recvfrom(sockfd, buffer, len, flags, NULL, NULL));
-}
 #endif
 weak_alias(__libc_recv,recv)
 libc_hidden_weak(recv)
@@ -407,6 +407,11 @@ ssize_t __libc_send(int sockfd, const void *buffer, size_t len, int flags)
 	return result;
 #endif
 }
+#elif defined(__NR_sendto)
+ssize_t __libc_send(int sockfd, const void *buffer, size_t len, int flags)
+{
+	return (sendto(sockfd, buffer, len, flags, NULL, 0));
+}
 #elif defined(__NR_socketcall)
 /* send, sendto added by bir7 at leland.stanford.edu */
 ssize_t __libc_send(int sockfd, const void *buffer, size_t len, int flags)
@@ -429,11 +434,6 @@ ssize_t __libc_send(int sockfd, const void *buffer, size_t len, int flags)
 #endif
 }
 
-#elif defined(__NR_sendto)
-ssize_t __libc_send(int sockfd, const void *buffer, size_t len, int flags)
-{
-	return (sendto(sockfd, buffer, len, flags, NULL, 0));
-}
 #endif
 weak_alias(__libc_send,send)
 libc_hidden_weak(send)


More information about the uClibc-cvs mailing list