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

[gnunet]

Author: bratao
Date: 2011-11-10 11:33:36 +0100 (Thu, 10 Nov 2011)
New Revision: 18091

Modified:
   gnunet-gtk/src/lib/eventloop.c
Log:
Fix Iterators

Modified: gnunet-gtk/src/lib/eventloop.c
===================================================================
--- gnunet-gtk/src/lib/eventloop.c      2011-11-10 09:50:37 UTC (rev 18090)
+++ gnunet-gtk/src/lib/eventloop.c      2011-11-10 10:33:36 UTC (rev 18091)
@@ -376,7 +376,7 @@
   /* FIXME: why while(1)  here!? */
   while (1)
   {
-    struct GNUNET_CONTAINER_SList_Iterator *t;
+    struct GNUNET_CONTAINER_SList_Iterator t;
 
     fd_counter = 0;
     /* We might overshoot a little, but that won't hurt very much */
@@ -402,11 +402,11 @@
     if (rfds != NULL)
     {
       for (t = GNUNET_CONTAINER_slist_begin (rfds->handles), i = 0;
-           GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
-           GNUNET_CONTAINER_slist_next (t), i += 1)
+           GNUNET_CONTAINER_slist_end (&t) != GNUNET_YES;
+           GNUNET_CONTAINER_slist_next (&t), i += 1)
       {
         struct GNUNET_DISK_FileHandle *fh =
-            GNUNET_CONTAINER_slist_get (t, NULL);
+            GNUNET_CONTAINER_slist_get (&t, NULL);
         if (fh->type == GNUNET_PIPE)
         {
           if (!ReadFile (fh->h, NULL, 0, NULL, fh->oOverlapRead))
@@ -476,11 +476,11 @@
     if (efds != NULL)
     {
       for (t = GNUNET_CONTAINER_slist_begin (efds->handles), i = 0;
-           GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
-           GNUNET_CONTAINER_slist_next (t), i += 1)
+           GNUNET_CONTAINER_slist_end (&t) != GNUNET_YES;
+           GNUNET_CONTAINER_slist_next (&t), i += 1)
       {
         struct GNUNET_DISK_FileHandle *fh =
-            GNUNET_CONTAINER_slist_get (t, NULL);
+            GNUNET_CONTAINER_slist_get (&t, NULL);
 
         DWORD dwBytes;
 
@@ -497,7 +497,7 @@
         }
       }
     }
-    GNUNET_CONTAINER_slist_iter_destroy (t);
+    GNUNET_CONTAINER_slist_iter_destroy (&t);
 
     if ((rfds != NULL) && (rfds->sds.fd_count > 0))
     {
@@ -705,14 +705,14 @@
     {
       if (efds != NULL)
       {
-        struct GNUNET_CONTAINER_SList_Iterator *t;
+        struct GNUNET_CONTAINER_SList_Iterator t;
 
         for (t = GNUNET_CONTAINER_slist_begin (efds->handles), i = 0;
-             GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
-             GNUNET_CONTAINER_slist_next (t), i += 1)
+             GNUNET_CONTAINER_slist_end (&t) != GNUNET_YES;
+             GNUNET_CONTAINER_slist_next (&t), i += 1)
         {
           struct GNUNET_DISK_FileHandle *fh =
-              GNUNET_CONTAINER_slist_get (t, NULL);
+              GNUNET_CONTAINER_slist_get (&t, NULL);
           if (fh == ml->read_array[i])
           {
             GNUNET_CONTAINER_slist_add (ml->handles_except,
@@ -722,7 +722,7 @@
             break;
           }
         }
-        GNUNET_CONTAINER_slist_iter_destroy (t);
+        GNUNET_CONTAINER_slist_iter_destroy (&t);
       }
     }
     else if (waitstatus <= 0)
@@ -771,20 +771,20 @@
   }
   if (rfds)
   {
-    struct GNUNET_CONTAINER_SList_Iterator *t;
+    struct GNUNET_CONTAINER_SList_Iterator t;
 
     for (i = 0; i < rfds->sds.fd_count; i++)
       WSAEventSelect (rfds->sds.fd_array[i], ml->hEventRead, 0);
     for (t = GNUNET_CONTAINER_slist_begin (rfds->handles);
-         GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
-         GNUNET_CONTAINER_slist_next (t))
+         GNUNET_CONTAINER_slist_end (&t) != GNUNET_YES;
+         GNUNET_CONTAINER_slist_next (&t))
     {
-      struct GNUNET_DISK_FileHandle *fh = 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);
     }
-    GNUNET_CONTAINER_slist_iter_destroy (t);
+    GNUNET_CONTAINER_slist_iter_destroy (&t);
     GNUNET_NETWORK_fdset_zero (rfds);
     if (select_ret != -1 && socks > 0)
       GNUNET_NETWORK_fdset_copy_native (rfds, &aread, select_ret);