summaryrefslogtreecommitdiffstats
path: root/source3/lib/system.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2014-09-17 00:25:38 +0200
committerVolker Lendecke <vl@samba.org>2014-09-18 20:36:11 +0200
commitfb9067c789263d5e2fcc26adb46463b974ccdaae (patch)
treee4ef14e521e4d540c46f22b178d8b065e71fff89 /source3/lib/system.c
parent6a1c51ee80cb1920248d72dfc79130cb114adad3 (diff)
downloadsamba-fb9067c789263d5e2fcc26adb46463b974ccdaae.tar.gz
samba-fb9067c789263d5e2fcc26adb46463b974ccdaae.tar.xz
samba-fb9067c789263d5e2fcc26adb46463b974ccdaae.zip
Remove a few #ifdef EWOULDBLOCk
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'source3/lib/system.c')
-rw-r--r--source3/lib/system.c20
1 files changed, 4 insertions, 16 deletions
diff --git a/source3/lib/system.c b/source3/lib/system.c
index 698de1221c..6478e6f512 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -62,11 +62,8 @@ ssize_t sys_read(int fd, void *buf, size_t count)
do {
ret = read(fd, buf, count);
-#if defined(EWOULDBLOCK)
} while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
-#else
- } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
-#endif
+
return ret;
}
@@ -80,11 +77,8 @@ ssize_t sys_write(int fd, const void *buf, size_t count)
do {
ret = write(fd, buf, count);
-#if defined(EWOULDBLOCK)
} while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
-#else
- } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
-#endif
+
return ret;
}
@@ -109,11 +103,8 @@ ssize_t sys_writev(int fd, const struct iovec *iov, int iovcnt)
do {
ret = writev(fd, iov, iovcnt);
-#if defined(EWOULDBLOCK)
} while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
-#else
- } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
-#endif
+
return ret;
}
@@ -159,11 +150,8 @@ ssize_t sys_send(int s, const void *msg, size_t len, int flags)
do {
ret = send(s, msg, len, flags);
-#if defined(EWOULDBLOCK)
} while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
-#else
- } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
-#endif
+
return ret;
}