From 36aeeafb532a583f3e7fdfd3627844dd6f6da68f Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 5 Mar 2004 03:10:08 +0000 Subject: [PATCH] modernized declarations (use WRAPPER_DECL) WsendAll(),WrecvAll(): added 'int *err' parameter and do not use perror() anymore git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1064 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/ensc_wrappers/wrappers-iosock.hc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/util-vserver/ensc_wrappers/wrappers-iosock.hc b/util-vserver/ensc_wrappers/wrappers-iosock.hc index 0da40c9..b527afb 100644 --- a/util-vserver/ensc_wrappers/wrappers-iosock.hc +++ b/util-vserver/ensc_wrappers/wrappers-iosock.hc @@ -22,15 +22,16 @@ #include -inline static UNUSED bool -WsendAll(int fd, void const *ptr_v, size_t len) +inline static WRAPPER_DECL bool +WsendAll(int fd, void const *ptr_v, size_t len, int *err) { register char const *ptr = ptr_v; + if (err) *err = 0; while (len>0) { size_t res = TEMP_FAILURE_RETRY(send(fd, ptr, len, MSG_NOSIGNAL)); if (res==(size_t)-1) { - perror("send()"); + if (err) *err = errno; return false; } @@ -42,7 +43,7 @@ WsendAll(int fd, void const *ptr_v, size_t len) return true; } -inline static UNUSED void +inline static WRAPPER_DECL void EsendAll(int fd, void const *ptr_v, size_t len) { register char const *ptr = ptr_v; @@ -57,15 +58,16 @@ EsendAll(int fd, void const *ptr_v, size_t len) } -inline static UNUSED bool -WrecvAll(int fd, void *ptr_v, size_t len) +inline static WRAPPER_DECL bool +WrecvAll(int fd, void *ptr_v, size_t len, int *err) { register char *ptr = ptr_v; + if (err) *err = 0; while (len>0) { size_t res = TEMP_FAILURE_RETRY(recv(fd, ptr, len, MSG_NOSIGNAL)); if (res==(size_t)-1) { - perror("recv()"); + if (err) *err = errno; return false; } @@ -77,7 +79,7 @@ WrecvAll(int fd, void *ptr_v, size_t len) return true; } -inline static UNUSED bool +inline static WRAPPER_DECL bool ErecvAll(int fd, void *ptr_v, size_t len) { register char *ptr = ptr_v; -- 1.8.1.5