From 8ba95f2eb5ace15d9c047e2a6d100b0bc1feeb92 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 15 Mar 2011 10:03:17 +0000 Subject: [PATCH] simplify --- src/daemon/daemon.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c index 23836168..3dce3942 100644 --- a/src/daemon/daemon.c +++ b/src/daemon/daemon.c @@ -755,19 +755,16 @@ send_param_adapter (struct MHD_Connection *connection, left); if (ret != -1) return ret; - if (ret == -1) - { - if (EINTR == errno) - return 0; - if ( (EINVAL == errno) || - (EBADF == errno) || - (EAGAIN == errno) ) - return -1; - /* None of the 'usual' sendfile errors occurred, so we should try - to fall back to 'SEND'; see also this thread for info on - odd libc/Linux behavior with sendfile: - http://lists.gnu.org/archive/html/libmicrohttpd/2011-02/msg00015.html */ - } + if (EINTR == errno) + return 0; + if ( (EINVAL == errno) || + (EBADF == errno) || + (EAGAIN == errno) ) + return -1; + /* None of the 'usual' sendfile errors occurred, so we should try + to fall back to 'SEND'; see also this thread for info on + odd libc/Linux behavior with sendfile: + http://lists.gnu.org/archive/html/libmicrohttpd/2011-02/msg00015.html */ } #endif return SEND (connection->socket_fd, other, i, MSG_NOSIGNAL | MSG_DONTWAIT);