some code cleanup

1 files changed, 11 insertions, 10 deletions

diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index 507ce315..82168e3a 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -367,8 +367,7 @@ gnunet_gtk_select (void *cls,
                GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
                GNUNET_CONTAINER_slist_next (t), i += 1)
             {
-              struct GNUNET_DISK_FileHandle *fh;
-              fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (t, NULL);
+              struct GNUNET_DISK_FileHandle *fh = GNUNET_CONTAINER_slist_get (t, NULL);
               if (fh->type == GNUNET_PIPE)
                 {
                   if (!ReadFile (fh->h, NULL, 0, NULL, fh->oOverlapRead))
@@ -436,9 +435,9 @@ gnunet_gtk_select (void *cls,
                GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
                GNUNET_CONTAINER_slist_next (t), i += 1)
             {
-              struct GNUNET_DISK_FileHandle *fh;
+              struct GNUNET_DISK_FileHandle *fh = GNUNET_CONTAINER_slist_get (t, NULL);
+
               DWORD dwBytes;
-              fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (t, NULL);
               if (fh->type == GNUNET_PIPE)
                 {
                   if (!PeekNamedPipe (fh->h, NULL, 0, NULL, &dwBytes, NULL))
@@ -616,7 +615,9 @@ gnunet_gtk_select (void *cls,
     bret = PeekNamedPipe (ml->read_array[i]->h, NULL, 0, NULL, &waitstatus, NULL);
     error = GetLastError ();
 #if DEBUG_NETWORK
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peek at read pipe %d (0x%x) returned %d (%d bytes available) GLE %u\n", i, ml->read_array[i]->h, bret, waitstatus, error);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+                "Peek at read pipe %d (0x%x) returned %d (%d bytes available) GLE %u\n", 
+                i, ml->read_array[i]->h, bret, waitstatus, error);
 #endif
     if (bret == 0 || (ml->cached_poll_array[i].revents & G_IO_ERR))
     {
@@ -627,8 +628,7 @@ gnunet_gtk_select (void *cls,
             GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
             GNUNET_CONTAINER_slist_next (t), i += 1)
         {
-          struct GNUNET_DISK_FileHandle *fh;
-          fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (t, NULL);
+          struct GNUNET_DISK_FileHandle *fh = GNUNET_CONTAINER_slist_get (t, NULL);
           if (fh == ml->read_array[i])
           {
             GNUNET_CONTAINER_slist_add (ml->handles_except,
@@ -666,7 +666,9 @@ gnunet_gtk_select (void *cls,
       status = send (wfds->sds.fd_array[i], NULL, 0, 0);
       error = GetLastError ();
 #if DEBUG_NETWORK
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "send to the socket %d returned %d (%u)\n", i, status, error);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+                  "send to the socket %d returned %d (%u)\n", 
+                  i, status, error);
 #endif
       if (status == 0
           || (error != WSAEWOULDBLOCK && error != WSAENOTCONN)
@@ -686,8 +688,7 @@ gnunet_gtk_select (void *cls,
         GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
         GNUNET_CONTAINER_slist_next (t))
     {
-      struct GNUNET_DISK_FileHandle *fh;
-      fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (t, NULL);
+      struct GNUNET_DISK_FileHandle *fh = GNUNET_CONTAINER_slist_get (t, NULL);
       if (fh->type == GNUNET_PIPE)
         CancelIo (fh->h);
     }