From ca2e14ddc3d753f79319060f3024a0c9b3a57b98 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 19 Apr 2002 21:45:02 +0000 Subject: We cannot set errno=0 in any of the wrapper calls as this breaks UNIX error returns to the client. Jeremy. (This used to be commit 1d66e53a64ec2878293e6d74a852b736ddab8f21) --- source3/lib/system.c | 7 ------- source3/tdb/tdb.c | 1 - 2 files changed, 8 deletions(-) diff --git a/source3/lib/system.c b/source3/lib/system.c index d9a4bbd83b..dfd206027e 100644 --- a/source3/lib/system.c +++ b/source3/lib/system.c @@ -81,7 +81,6 @@ ssize_t sys_read(int fd, void *buf, size_t count) ssize_t ret; do { - errno = 0; ret = read(fd, buf, count); } while (ret == -1 && errno == EINTR); return ret; @@ -96,7 +95,6 @@ ssize_t sys_write(int fd, const void *buf, size_t count) ssize_t ret; do { - errno = 0; ret = write(fd, buf, count); } while (ret == -1 && errno == EINTR); return ret; @@ -111,7 +109,6 @@ ssize_t sys_send(int s, const void *msg, size_t len, int flags) ssize_t ret; do { - errno = 0; ret = send(s, msg, len, flags); } while (ret == -1 && errno == EINTR); return ret; @@ -126,7 +123,6 @@ ssize_t sys_sendto(int s, const void *msg, size_t len, int flags, const struct ssize_t ret; do { - errno = 0; ret = sendto(s, msg, len, flags, to, tolen); } while (ret == -1 && errno == EINTR); return ret; @@ -141,7 +137,6 @@ ssize_t sys_recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *f ssize_t ret; do { - errno = 0; ret = recvfrom(s, buf, len, flags, from, fromlen); } while (ret == -1 && errno == EINTR); return ret; @@ -156,7 +151,6 @@ int sys_fcntl_ptr(int fd, int cmd, void *arg) int ret; do { - errno = 0; ret = fcntl(fd, cmd, arg); } while (ret == -1 && errno == EINTR); return ret; @@ -171,7 +165,6 @@ int sys_fcntl_long(int fd, int cmd, long arg) int ret; do { - errno = 0; ret = fcntl(fd, cmd, arg); } while (ret == -1 && errno == EINTR); return ret; diff --git a/source3/tdb/tdb.c b/source3/tdb/tdb.c index e3ba1db0d2..5c0fd436e3 100644 --- a/source3/tdb/tdb.c +++ b/source3/tdb/tdb.c @@ -185,7 +185,6 @@ static int tdb_brlock(TDB_CONTEXT *tdb, tdb_off offset, fl.l_pid = 0; do { - errno = 0; ret = fcntl(tdb->fd,lck_type,&fl); } while (ret == -1 && errno == EINTR); -- cgit