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

Khem Raj raj.khem at gmail.com
Sat Mar 19 18:51:25 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=6df10ec5705261cbea6d8c852bc117797cead64c
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/future

Make socketcall the last alternative.

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
 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 dd3bc5d..9f46130 100644
--- a/libc/inet/socketcalls.c
+++ b/libc/inet/socketcalls.c
@@ -226,6 +226,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)
@@ -247,11 +252,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)
@@ -366,6 +366,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)
@@ -388,11 +393,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)
-- 
1.7.3.4



More information about the uClibc-cvs mailing list