[GNUnet-SVN] r14649 - libmicrohttpd/src/daemon

[gnunet]

Author: grothoff
Date: 2011-03-15 11:03:17 +0100 (Tue, 15 Mar 2011)
New Revision: 14649

Modified:
   libmicrohttpd/src/daemon/daemon.c
Log:
simplify

Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c   2011-03-15 10:00:14 UTC (rev 14648)
+++ libmicrohttpd/src/daemon/daemon.c   2011-03-15 10:03:17 UTC (rev 14649)
@@ -755,19 +755,16 @@
                      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);