diff options
author | Christian Grothoff <christian@grothoff.org> | 2009-10-03 18:23:39 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2009-10-03 18:23:39 +0000 |
commit | 9a496f231cdaeb77da9b6f0ac8f77bac20fbd19c (patch) | |
tree | d5b3eda56638508b6bfdc00864df4bc43f07c282 /src/util/test_container_slist.c | |
parent | 71050ec2a7ea81ac57bc4fba010ae2baf027b8c6 (diff) | |
download | gnunet-9a496f231cdaeb77da9b6f0ac8f77bac20fbd19c.tar.gz gnunet-9a496f231cdaeb77da9b6f0ac8f77bac20fbd19c.zip |
fixing slist api and implementation
Diffstat (limited to 'src/util/test_container_slist.c')
-rw-r--r-- | src/util/test_container_slist.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/util/test_container_slist.c b/src/util/test_container_slist.c index a22d4be8a..9d75f1695 100644 --- a/src/util/test_container_slist.c +++ b/src/util/test_container_slist.c | |||
@@ -37,7 +37,7 @@ main (int argc, char *argv[]) | |||
37 | struct GNUNET_CONTAINER_SList *l; | 37 | struct GNUNET_CONTAINER_SList *l; |
38 | struct GNUNET_CONTAINER_SList_Iterator *it; | 38 | struct GNUNET_CONTAINER_SList_Iterator *it; |
39 | unsigned int i, j, s; | 39 | unsigned int i, j, s; |
40 | 40 | const void *p; | |
41 | 41 | ||
42 | GNUNET_log_setup ("test-container-slist", "WARNING", NULL); | 42 | GNUNET_log_setup ("test-container-slist", "WARNING", NULL); |
43 | 43 | ||
@@ -53,8 +53,6 @@ main (int argc, char *argv[]) | |||
53 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES; | 53 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES; |
54 | GNUNET_CONTAINER_slist_next (it), i--) | 54 | GNUNET_CONTAINER_slist_next (it), i--) |
55 | { | 55 | { |
56 | void *p; | ||
57 | |||
58 | p = GNUNET_CONTAINER_slist_get (it, &s); | 56 | p = GNUNET_CONTAINER_slist_get (it, &s); |
59 | CHECK (p != NULL); | 57 | CHECK (p != NULL); |
60 | j = *(int *) p; | 58 | j = *(int *) p; |
@@ -65,6 +63,7 @@ main (int argc, char *argv[]) | |||
65 | GNUNET_CONTAINER_slist_insert (it, GNUNET_MEM_DISP_TRANSIENT, &j, | 63 | GNUNET_CONTAINER_slist_insert (it, GNUNET_MEM_DISP_TRANSIENT, &j, |
66 | sizeof (j)); | 64 | sizeof (j)); |
67 | } | 65 | } |
66 | GNUNET_free (it); | ||
68 | CHECK (GNUNET_CONTAINER_slist_count (l) == 200); | 67 | CHECK (GNUNET_CONTAINER_slist_count (l) == 200); |
69 | i = 198; | 68 | i = 198; |
70 | CHECK (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i))); | 69 | CHECK (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i))); |
@@ -72,8 +71,6 @@ main (int argc, char *argv[]) | |||
72 | for (it = GNUNET_CONTAINER_slist_begin (l); | 71 | for (it = GNUNET_CONTAINER_slist_begin (l); |
73 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES;) | 72 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES;) |
74 | { | 73 | { |
75 | void *p; | ||
76 | |||
77 | p = GNUNET_CONTAINER_slist_get (it, &s); | 74 | p = GNUNET_CONTAINER_slist_get (it, &s); |
78 | CHECK (p != NULL); | 75 | CHECK (p != NULL); |
79 | CHECK (s == sizeof (i)); | 76 | CHECK (s == sizeof (i)); |
@@ -91,6 +88,7 @@ main (int argc, char *argv[]) | |||
91 | 88 | ||
92 | GNUNET_CONTAINER_slist_erase (it); | 89 | GNUNET_CONTAINER_slist_erase (it); |
93 | } | 90 | } |
91 | GNUNET_free (it); | ||
94 | CHECK (GNUNET_CONTAINER_slist_count (l) == 100); | 92 | CHECK (GNUNET_CONTAINER_slist_count (l) == 100); |
95 | i = 99; | 93 | i = 99; |
96 | CHECK (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == GNUNET_NO); | 94 | CHECK (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == GNUNET_NO); |