From 7ab341a2b0a4cb67ddb8d6b8d366e8bd59372688 Mon Sep 17 00:00:00 2001 From: Peter S. Mazinger Date: Mon, 21 Mar 2011 12:53:25 +0100 Subject: [PATCH 142/396] socketcalls.c: prefer using recvfrom in recv and sendto in send Make socketcall the last alternative. Signed-off-by: Peter S. Mazinger --- 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@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@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) -- 1.7.0.4