diff options
Diffstat (limited to 'libdaemon')
-rw-r--r-- | libdaemon/client/daemon-io.c | 2 | ||||
-rw-r--r-- | libdaemon/server/daemon-server.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/libdaemon/client/daemon-io.c b/libdaemon/client/daemon-io.c index 1f9d84053..6b7437ecc 100644 --- a/libdaemon/client/daemon-io.c +++ b/libdaemon/client/daemon-io.c @@ -48,7 +48,6 @@ int buffer_read(int fd, struct buffer *buffer) { errno = ECONNRESET; return 0; /* we should never encounter EOF here */ } else if (result < 0 && (errno == EAGAIN || - (EWOULDBLOCK != EAGAIN && errno == EWOULDBLOCK) || errno == EINTR || errno == EIO)) { fd_set in; FD_ZERO(&in); @@ -78,7 +77,6 @@ int buffer_write(int fd, const struct buffer *buffer) { if (result > 0) written += result; else if (result < 0 && (errno == EAGAIN || - (EWOULDBLOCK != EAGAIN && errno == EWOULDBLOCK) || errno == EINTR || errno == EIO)) { fd_set out; FD_ZERO(&out); diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c index 0368a9446..7c1b1cf89 100644 --- a/libdaemon/server/daemon-server.c +++ b/libdaemon/server/daemon-server.c @@ -677,8 +677,7 @@ void daemon_start(daemon_state s) perror("sigprocmask error"); if (ret < 0) { - if (errno != EINTR && errno != EAGAIN && - (EWOULDBLOCK == EAGAIN || errno != EWOULDBLOCK)) + if ((errno != EINTR) && (errno != EAGAIN)) perror("select error"); continue; } |