From af565f99ee61952efb9706398b32aa9d35a9b1c0 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sun, 3 Jul 2005 12:33:44 +0000 Subject: [PATCH] store result of read*(2) and write*(2) fucntions into signed variables; error handling is more cleaner in this way git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2116 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/ensc_wrappers/wrappers-io.hc | 8 ++++---- util-vserver/ensc_wrappers/wrappers-iosock.hc | 16 ++++++++-------- util-vserver/ensc_wrappers/wrappers-unistd.hc | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/util-vserver/ensc_wrappers/wrappers-io.hc b/util-vserver/ensc_wrappers/wrappers-io.hc index 3b212e6..4943222 100644 --- a/util-vserver/ensc_wrappers/wrappers-io.hc +++ b/util-vserver/ensc_wrappers/wrappers-io.hc @@ -48,8 +48,8 @@ EwriteAll(int fd, void const *ptr_v, size_t len) register char const *ptr = ptr_v; while (len>0) { - size_t res = TEMP_FAILURE_RETRY(write(fd, ptr, len)); - FatalErrnoError(res==(size_t)-1, "write()"); + ssize_t res = TEMP_FAILURE_RETRY(write(fd, ptr, len)); + FatalErrnoError(res==-1, "write()"); ptr += res; len -= res; @@ -85,8 +85,8 @@ EreadAll(int fd, void *ptr_v, size_t len) register char *ptr = ptr_v; while (len>0) { - size_t res = TEMP_FAILURE_RETRY(read(fd, ptr, len)); - FatalErrnoError(res==(size_t)-1, "read()"); + ssize_t res = TEMP_FAILURE_RETRY(read(fd, ptr, len)); + FatalErrnoError(res==-1, "read()"); if (res==0) return false; diff --git a/util-vserver/ensc_wrappers/wrappers-iosock.hc b/util-vserver/ensc_wrappers/wrappers-iosock.hc index b527afb..ee9f021 100644 --- a/util-vserver/ensc_wrappers/wrappers-iosock.hc +++ b/util-vserver/ensc_wrappers/wrappers-iosock.hc @@ -29,8 +29,8 @@ WsendAll(int fd, void const *ptr_v, size_t len, int *err) if (err) *err = 0; while (len>0) { - size_t res = TEMP_FAILURE_RETRY(send(fd, ptr, len, MSG_NOSIGNAL)); - if (res==(size_t)-1) { + ssize_t res = TEMP_FAILURE_RETRY(send(fd, ptr, len, MSG_NOSIGNAL)); + if (res==-1) { if (err) *err = errno; return false; } @@ -49,8 +49,8 @@ EsendAll(int fd, void const *ptr_v, size_t len) register char const *ptr = ptr_v; while (len>0) { - size_t res = TEMP_FAILURE_RETRY(send(fd, ptr, len, MSG_NOSIGNAL)); - FatalErrnoError(res==(size_t)-1, "send()"); + ssize_t res = TEMP_FAILURE_RETRY(send(fd, ptr, len, MSG_NOSIGNAL)); + FatalErrnoError(res==-1, "send()"); ptr += res; len -= res; @@ -65,8 +65,8 @@ WrecvAll(int fd, void *ptr_v, size_t len, int *err) if (err) *err = 0; while (len>0) { - size_t res = TEMP_FAILURE_RETRY(recv(fd, ptr, len, MSG_NOSIGNAL)); - if (res==(size_t)-1) { + ssize_t res = TEMP_FAILURE_RETRY(recv(fd, ptr, len, MSG_NOSIGNAL)); + if (res==-1) { if (err) *err = errno; return false; } @@ -85,8 +85,8 @@ ErecvAll(int fd, void *ptr_v, size_t len) register char *ptr = ptr_v; while (len>0) { - size_t res = TEMP_FAILURE_RETRY(recv(fd, ptr, len, MSG_NOSIGNAL)); - FatalErrnoError(res==(size_t)-1, "recv()"); + ssize_t res = TEMP_FAILURE_RETRY(recv(fd, ptr, len, MSG_NOSIGNAL)); + FatalErrnoError(res==-1, "recv()"); if (res==0) return false; diff --git a/util-vserver/ensc_wrappers/wrappers-unistd.hc b/util-vserver/ensc_wrappers/wrappers-unistd.hc index 9a89c3c..6b21fc3 100644 --- a/util-vserver/ensc_wrappers/wrappers-unistd.hc +++ b/util-vserver/ensc_wrappers/wrappers-unistd.hc @@ -85,8 +85,8 @@ Efork() inline static WRAPPER_DECL size_t Eread(int fd, void *ptr, size_t len) { - size_t res = read(fd, ptr, len); - FatalErrnoError((ssize_t)(res)==-1, "read()"); + ssize_t res = read(fd, ptr, len); + FatalErrnoError(res==-1, "read()"); return res; } @@ -94,8 +94,8 @@ Eread(int fd, void *ptr, size_t len) inline static WRAPPER_DECL size_t Ewrite(int fd, void const *ptr, size_t len) { - size_t res = write(fd, ptr, len); - FatalErrnoError((ssize_t)(res)==-1, "write()"); + ssize_t res = write(fd, ptr, len); + FatalErrnoError(res==-1, "write()"); return res; } @@ -103,8 +103,8 @@ Ewrite(int fd, void const *ptr, size_t len) inline static WRAPPER_DECL size_t Ereadlink(const char *path, char *buf, size_t bufsiz) { - size_t res = readlink(path, buf, bufsiz); - FatalErrnoError((ssize_t)(res)==-1, "readlink()"); + ssize_t res = readlink(path, buf, bufsiz); + FatalErrnoError(res==-1, "readlink()"); return res; } @@ -112,7 +112,7 @@ Ereadlink(const char *path, char *buf, size_t bufsiz) inline static WRAPPER_DECL size_t EreadlinkD(const char *path, char *buf, size_t bufsiz) { - size_t res = readlink(path, buf, bufsiz); + ssize_t res = readlink(path, buf, bufsiz); ENSC_DETAIL1(msg, "readlink", path, 1); FatalErrnoError((ssize_t)(res)==-1, msg); -- 1.8.1.5