[GNUnet-SVN] r11905 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2010-06-23 16:23:10 +0200 (Wed, 23 Jun 2010)
New Revision: 11905

Modified:
   gnunet/src/util/network.c
Log:
cleaning

Modified: gnunet/src/util/network.c
===================================================================
--- gnunet/src/util/network.c   2010-06-23 14:22:54 UTC (rev 11904)
+++ gnunet/src/util/network.c   2010-06-23 14:23:10 UTC (rev 11905)
@@ -142,11 +142,16 @@
 socket_set_inheritable (const struct GNUNET_NETWORK_Handle *h)
 {
   int i;
-  i = fcntl (h->fd, F_GETFD);
+
+  i = fcntl (h->fd, F_GETFD);  
+  if (i < 0)
+    return GNUNET_SYSERR;
   if (i == (i | FD_CLOEXEC))
     return GNUNET_OK;
-  return (fcntl (h->fd, F_SETFD, i | FD_CLOEXEC) == 0)
-    ? GNUNET_OK : GNUNET_SYSERR;
+  i |= FD_CLOEXEC;
+  if (fcntl (h->fd, F_SETFD, i) < 0)
+    return GNUNET_SYSERR;
+  return GNUNET_OK;
 }
 #endif