some code cleanup

1 files changed, 19 insertions, 17 deletions

diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index ab9b8490..24e8cba3 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -258,37 +258,39 @@ gnunet_gtk_select (void *cls,
 #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;