stuff

[oweals/gnunet.git] / src / util / test_container_slist.c

diff --git a/src/util/test_container_slist.c b/src/util/test_container_slist.c
index a22d4be8ac1a14105ae7d2208f9561722984a9f1..3f3b489e91cb80d755a487ce6da3d6a3c7feaf98 100644 (file)
--- a/src/util/test_container_slist.c
+++ b/src/util/test_container_slist.c
@@ -36,8 +36,10 @@ main (int argc, char *argv[])
 {
   struct GNUNET_CONTAINER_SList *l;
   struct GNUNET_CONTAINER_SList_Iterator *it;
-  unsigned int i, j, s;
-
+  unsigned int i;
+  unsigned int j;
+  size_t s;
+  const void *p;
 
   GNUNET_log_setup ("test-container-slist", "WARNING", NULL);
 
@@ -46,15 +48,15 @@ main (int argc, char *argv[])
   CHECK (GNUNET_CONTAINER_slist_count (l) == 0);
 
   for (i = 0; i < 100; i++)
-    GNUNET_CONTAINER_slist_add (l, GNUNET_MEM_DISP_TRANSIENT, &i, sizeof (i));
+    GNUNET_CONTAINER_slist_add (l,
+                                GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+                                &i, sizeof (i));
   CHECK (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--)
     {
-      void *p;
-
       p = GNUNET_CONTAINER_slist_get (it, &s);
       CHECK (p != NULL);
       j = *(int *) p;
@@ -62,9 +64,11 @@ main (int argc, char *argv[])
       CHECK (s == sizeof (i));
 
       j *= 2;
-      GNUNET_CONTAINER_slist_insert (it, GNUNET_MEM_DISP_TRANSIENT, &j,
-                                     sizeof (j));
+      GNUNET_CONTAINER_slist_insert (it,
+                                     GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+                                     &j, sizeof (j));
     }
+  GNUNET_CONTAINER_slist_iter_destroy (it);
   CHECK (GNUNET_CONTAINER_slist_count (l) == 200);
   i = 198;
   CHECK (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)));
@@ -72,8 +76,6 @@ main (int argc, char *argv[])
   for (it = GNUNET_CONTAINER_slist_begin (l);
        GNUNET_CONTAINER_slist_end (it) != GNUNET_YES;)
     {
-      void *p;
-
       p = GNUNET_CONTAINER_slist_get (it, &s);
       CHECK (p != NULL);
       CHECK (s == sizeof (i));
@@ -91,6 +93,7 @@ main (int argc, char *argv[])
 
       GNUNET_CONTAINER_slist_erase (it);
     }
+  GNUNET_CONTAINER_slist_iter_destroy (it);
   CHECK (GNUNET_CONTAINER_slist_count (l) == 100);
   i = 99;
   CHECK (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == GNUNET_NO);
@@ -101,7 +104,9 @@ main (int argc, char *argv[])
   CHECK (GNUNET_CONTAINER_slist_count (l) == 0);
 
   for (i = 0; i < 100; i++)
-    GNUNET_CONTAINER_slist_add (l, GNUNET_MEM_DISP_TRANSIENT, &i, sizeof (i));
+    GNUNET_CONTAINER_slist_add (l,
+                                GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+                                &i, sizeof (i));
 
   GNUNET_CONTAINER_slist_destroy (l);