X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftest_container_slist.c;h=1b63d3dbce1213294bdbc6cbd0a6d414a5781bf3;hb=72c8645af31896829b674b575c5375706f362a30;hp=13c12bc5ad30626cf2e2286bd2abf394731b77e7;hpb=502af2167f7c218366666ca4944bd7cc54b5b19a;p=oweals%2Fgnunet.git

diff --git a/src/util/test_container_slist.c b/src/util/test_container_slist.c
index 13c12bc5a..1b63d3dbc 100644
--- a/src/util/test_container_slist.c
+++ b/src/util/test_container_slist.c
@@ -32,7 +32,7 @@ int
 main (int argc, char *argv[])
 {
   struct GNUNET_CONTAINER_SList *l;
-  struct GNUNET_CONTAINER_SList_Iterator *it;
+  struct GNUNET_CONTAINER_SList_Iterator it;
   unsigned int i;
   int *ip;
   unsigned int j;
@@ -46,53 +46,50 @@ main (int argc, char *argv[])
   GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 0);
 
   for (i = 0; i < 100; i++)
-    GNUNET_CONTAINER_slist_add (l,
-                                GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+    GNUNET_CONTAINER_slist_add (l, GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
                                 &i, sizeof (i));
   GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 100);
 
   for (it = GNUNET_CONTAINER_slist_begin (l), i = 99;
-       GNUNET_CONTAINER_slist_end (it) != GNUNET_YES;
-       GNUNET_CONTAINER_slist_next (it), i--)
+       GNUNET_CONTAINER_slist_end (&it) != GNUNET_YES;
+       GNUNET_CONTAINER_slist_next (&it), i--)
   {
-    p = GNUNET_CONTAINER_slist_get (it, &s);
+    p = GNUNET_CONTAINER_slist_get (&it, &s);
 
     if ((p == NULL) || (i != (j = *(int *) p)) || (s != sizeof (i)))
     {
-      GNUNET_CONTAINER_slist_iter_destroy (it);
+      GNUNET_CONTAINER_slist_iter_destroy (&it);
       GNUNET_assert (0);
     }
     j *= 2;
-    GNUNET_CONTAINER_slist_insert (it,
+    GNUNET_CONTAINER_slist_insert (&it,
                                    GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
                                    &j, sizeof (j));
   }
-  GNUNET_CONTAINER_slist_iter_destroy (it);
   GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 200);
   i = 198;
   GNUNET_assert (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)));
 
   for (it = GNUNET_CONTAINER_slist_begin (l);
-       GNUNET_CONTAINER_slist_end (it) != GNUNET_YES;)
+       GNUNET_CONTAINER_slist_end (&it) != GNUNET_YES;)
   {
-    p = GNUNET_CONTAINER_slist_get (it, &s);
+    p = GNUNET_CONTAINER_slist_get (&it, &s);
     GNUNET_assert (p != NULL);
     GNUNET_assert (s == sizeof (i));
     i = *(int *) p;
 
-    GNUNET_assert (GNUNET_CONTAINER_slist_next (it) == GNUNET_YES);
-    GNUNET_assert (GNUNET_CONTAINER_slist_end (it) != GNUNET_YES);
+    GNUNET_assert (GNUNET_CONTAINER_slist_next (&it) == GNUNET_YES);
+    GNUNET_assert (GNUNET_CONTAINER_slist_end (&it) != GNUNET_YES);
 
-    p = GNUNET_CONTAINER_slist_get (it, &s);
+    p = GNUNET_CONTAINER_slist_get (&it, &s);
     GNUNET_assert (p != NULL);
     GNUNET_assert (s == sizeof (j));
     j = *(int *) p;
 
     GNUNET_assert (j * 2 == i);
 
-    GNUNET_CONTAINER_slist_erase (it);
+    GNUNET_CONTAINER_slist_erase (&it);
   }
-  GNUNET_CONTAINER_slist_iter_destroy (it);
   GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 100);
   i = 99;
   GNUNET_assert (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) ==
@@ -105,8 +102,7 @@ main (int argc, char *argv[])
   GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 0);
 
   for (i = 0; i < 100; i++)
-    GNUNET_CONTAINER_slist_add (l,
-                                GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+    GNUNET_CONTAINER_slist_add (l, GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
                                 &i, sizeof (i));
   /*check slist_append */
   GNUNET_CONTAINER_slist_append (l, l);
@@ -124,18 +120,16 @@ main (int argc, char *argv[])
   GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 100);
 
   for (it = GNUNET_CONTAINER_slist_begin (l), i = 0;
-       GNUNET_CONTAINER_slist_end (it) != GNUNET_YES;
-       GNUNET_CONTAINER_slist_next (it), i++)
+       GNUNET_CONTAINER_slist_end (&it) != GNUNET_YES;
+       GNUNET_CONTAINER_slist_next (&it), i++)
   {
-    p = GNUNET_CONTAINER_slist_get (it, &s);
+    p = GNUNET_CONTAINER_slist_get (&it, &s);
 
     if ((p == NULL) || (i != *(int *) p) || (s != sizeof (i)))
     {
-      GNUNET_CONTAINER_slist_iter_destroy (it);
       GNUNET_assert (0);
     }
   }
-  GNUNET_CONTAINER_slist_iter_destroy (it);
   GNUNET_CONTAINER_slist_destroy (l);
 
   /*check if disp = GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC */
@@ -145,18 +139,17 @@ main (int argc, char *argv[])
   {
     ip = GNUNET_malloc (sizeof (int));
     *ip = i;
-    GNUNET_CONTAINER_slist_add (l,
-                                GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC,
+    GNUNET_CONTAINER_slist_add (l, GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC,
                                 ip, sizeof (int));
   }
   //creat_add
   it = GNUNET_CONTAINER_slist_begin (l);
-  p = GNUNET_CONTAINER_slist_get (it, &s);
+  p = GNUNET_CONTAINER_slist_get (&it, &s);
   GNUNET_assert (p != NULL);
   //slist_erase
-  GNUNET_assert (GNUNET_CONTAINER_slist_next (it) == GNUNET_YES);
-  GNUNET_CONTAINER_slist_erase (it);
-  GNUNET_CONTAINER_slist_iter_destroy (it);
+  GNUNET_assert (GNUNET_CONTAINER_slist_next (&it) == GNUNET_YES);
+  GNUNET_CONTAINER_slist_erase (&it);
+  GNUNET_CONTAINER_slist_iter_destroy (&it);
   GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 99);
   //slist_clear
   GNUNET_CONTAINER_slist_clear (l);