[GNUnet-SVN] r16522 - gnunet-gtk/src/lib

[gnunet]

Author: grothoff
Date: 2011-08-15 14:23:08 +0200 (Mon, 15 Aug 2011)
New Revision: 16522

Modified:
   gnunet-gtk/src/lib/eventloop.c
Log:
some code cleanup

Modified: gnunet-gtk/src/lib/eventloop.c
===================================================================
--- gnunet-gtk/src/lib/eventloop.c      2011-08-15 12:18:52 UTC (rev 16521)
+++ gnunet-gtk/src/lib/eventloop.c      2011-08-15 12:23:08 UTC (rev 16522)
@@ -258,37 +258,39 @@
 #endif
 
   if (TRUE != g_main_loop_is_running (ml->gml))
-    return GNUNET_NETWORK_socket_select (rfds, wfds, efds, timeout);
-
-  FD_ZERO (&aread);
-  FD_ZERO (&awrite);
-  FD_ZERO (&aexcept);
-  if (rfds)
+    return GNUNET_NETWORK_socket_select (rfds, 
+                                        wfds, 
+                                        efds,
+                                        timeout);
+  if (NULL != rfds)
     FD_COPY (&rfds->sds, &aread);
-  if (wfds)
+  else
+    FD_ZERO (&aread);
+  if (NULL != wfds)
     FD_COPY (&wfds->sds, &awrite);
-  if (efds)
+  else
+    FD_ZERO (&awrite);
+  if (NULL != efds)
     FD_COPY (&efds->sds, &aexcept);
+  else
+    FD_ZERO (&aexcept);
 
 #if WINDOWS
   ResetEvent (ml->hEventRead);
   ResetEvent (ml->hEventWrite);
   ResetEvent (ml->hEventException);
-
   GNUNET_CONTAINER_slist_clear (ml->handles_read);
   GNUNET_CONTAINER_slist_clear (ml->handles_write);
   GNUNET_CONTAINER_slist_clear (ml->handles_except);
 #endif
 
-
+  max_nfds = -1;
   if (rfds != NULL)
-    max_nfds = rfds->nsds;
-  else
-    max_nfds = -1;
-  if (wfds != NULL && max_nfds < wfds->nsds)
-    max_nfds = wfds->nsds;
-  if (efds != NULL && max_nfds < efds->nsds)
-    max_nfds = efds->nsds;
+    max_nfds = GNUNET_MAX (max_nfds, rfds->nsds);
+  if (wfds != NULL)
+    max_nfds = GNUNET_MAX (max_nfds, wfds->nsds);
+  if (efds != NULL)
+    max_nfds = GNUNET_MAX (max_nfds, efds->nsds);
 
   allocated_nfds = ml->cached_poll_array_size;
   gfds = ml->cached_poll_array;