diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-10-11 09:43:04 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-10-11 09:43:04 +0000 |
commit | d9d94d0e53d26af75ec8241383d166544ebd79f3 (patch) | |
tree | 9080b73624389403a198257fe0547bb4634e64d2 /src/util/test_container_slist.c | |
parent | 2d792ee2e9cc0c993b8907e2c8edb0c2b8465343 (diff) | |
download | gnunet-d9d94d0e53d26af75ec8241383d166544ebd79f3.tar.gz gnunet-d9d94d0e53d26af75ec8241383d166544ebd79f3.zip |
converting to GNUNET_LOG_from*
Diffstat (limited to 'src/util/test_container_slist.c')
-rw-r--r-- | src/util/test_container_slist.c | 95 |
1 files changed, 49 insertions, 46 deletions
diff --git a/src/util/test_container_slist.c b/src/util/test_container_slist.c index 4a277dab5..307a6b248 100644 --- a/src/util/test_container_slist.c +++ b/src/util/test_container_slist.c | |||
@@ -46,26 +46,27 @@ main (int argc, char *argv[]) | |||
46 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 0); | 46 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 0); |
47 | 47 | ||
48 | for (i = 0; i < 100; i++) | 48 | for (i = 0; i < 100; i++) |
49 | GNUNET_CONTAINER_slist_add (l, GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, | 49 | GNUNET_CONTAINER_slist_add (l, |
50 | &i, sizeof (i)); | 50 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, |
51 | &i, sizeof (i)); | ||
51 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 100); | 52 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 100); |
52 | 53 | ||
53 | for (it = GNUNET_CONTAINER_slist_begin (l), i = 99; | 54 | for (it = GNUNET_CONTAINER_slist_begin (l), i = 99; |
54 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES; | 55 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES; |
55 | GNUNET_CONTAINER_slist_next (it), i--) | 56 | GNUNET_CONTAINER_slist_next (it), i--) |
56 | { | ||
57 | p = GNUNET_CONTAINER_slist_get (it, &s); | ||
58 | |||
59 | if ((p == NULL) || (i != (j = *(int *) p)) || (s != sizeof (i))) | ||
60 | { | 57 | { |
61 | GNUNET_CONTAINER_slist_iter_destroy (it); | 58 | p = GNUNET_CONTAINER_slist_get (it, &s); |
62 | GNUNET_assert (0); | 59 | |
60 | if ((p == NULL) || (i != (j = *(int *) p)) || (s != sizeof (i))) | ||
61 | { | ||
62 | GNUNET_CONTAINER_slist_iter_destroy (it); | ||
63 | GNUNET_assert (0); | ||
64 | } | ||
65 | j *= 2; | ||
66 | GNUNET_CONTAINER_slist_insert (it, | ||
67 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, | ||
68 | &j, sizeof (j)); | ||
63 | } | 69 | } |
64 | j *= 2; | ||
65 | GNUNET_CONTAINER_slist_insert (it, | ||
66 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, | ||
67 | &j, sizeof (j)); | ||
68 | } | ||
69 | GNUNET_CONTAINER_slist_iter_destroy (it); | 70 | GNUNET_CONTAINER_slist_iter_destroy (it); |
70 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 200); | 71 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 200); |
71 | i = 198; | 72 | i = 198; |
@@ -73,39 +74,40 @@ main (int argc, char *argv[]) | |||
73 | 74 | ||
74 | for (it = GNUNET_CONTAINER_slist_begin (l); | 75 | for (it = GNUNET_CONTAINER_slist_begin (l); |
75 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES;) | 76 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES;) |
76 | { | 77 | { |
77 | p = GNUNET_CONTAINER_slist_get (it, &s); | 78 | p = GNUNET_CONTAINER_slist_get (it, &s); |
78 | GNUNET_assert (p != NULL); | 79 | GNUNET_assert (p != NULL); |
79 | GNUNET_assert (s == sizeof (i)); | 80 | GNUNET_assert (s == sizeof (i)); |
80 | i = *(int *) p; | 81 | i = *(int *) p; |
81 | 82 | ||
82 | GNUNET_assert (GNUNET_CONTAINER_slist_next (it) == GNUNET_YES); | 83 | GNUNET_assert (GNUNET_CONTAINER_slist_next (it) == GNUNET_YES); |
83 | GNUNET_assert (GNUNET_CONTAINER_slist_end (it) != GNUNET_YES); | 84 | GNUNET_assert (GNUNET_CONTAINER_slist_end (it) != GNUNET_YES); |
84 | 85 | ||
85 | p = GNUNET_CONTAINER_slist_get (it, &s); | 86 | p = GNUNET_CONTAINER_slist_get (it, &s); |
86 | GNUNET_assert (p != NULL); | 87 | GNUNET_assert (p != NULL); |
87 | GNUNET_assert (s == sizeof (j)); | 88 | GNUNET_assert (s == sizeof (j)); |
88 | j = *(int *) p; | 89 | j = *(int *) p; |
89 | 90 | ||
90 | GNUNET_assert (j * 2 == i); | 91 | GNUNET_assert (j * 2 == i); |
91 | 92 | ||
92 | GNUNET_CONTAINER_slist_erase (it); | 93 | GNUNET_CONTAINER_slist_erase (it); |
93 | } | 94 | } |
94 | GNUNET_CONTAINER_slist_iter_destroy (it); | 95 | GNUNET_CONTAINER_slist_iter_destroy (it); |
95 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 100); | 96 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 100); |
96 | i = 99; | 97 | i = 99; |
97 | GNUNET_assert (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == | 98 | GNUNET_assert (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == |
98 | GNUNET_NO); | 99 | GNUNET_NO); |
99 | i = 198; | 100 | i = 198; |
100 | GNUNET_assert (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == | 101 | GNUNET_assert (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == |
101 | GNUNET_YES); | 102 | GNUNET_YES); |
102 | 103 | ||
103 | GNUNET_CONTAINER_slist_clear (l); | 104 | GNUNET_CONTAINER_slist_clear (l); |
104 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 0); | 105 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 0); |
105 | 106 | ||
106 | for (i = 0; i < 100; i++) | 107 | for (i = 0; i < 100; i++) |
107 | GNUNET_CONTAINER_slist_add (l, GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, | 108 | GNUNET_CONTAINER_slist_add (l, |
108 | &i, sizeof (i)); | 109 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, |
110 | &i, sizeof (i)); | ||
109 | /*check slist_append */ | 111 | /*check slist_append */ |
110 | GNUNET_CONTAINER_slist_append (l, l); | 112 | GNUNET_CONTAINER_slist_append (l, l); |
111 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 200); | 113 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 200); |
@@ -116,23 +118,23 @@ main (int argc, char *argv[]) | |||
116 | l = GNUNET_CONTAINER_slist_create (); | 118 | l = GNUNET_CONTAINER_slist_create (); |
117 | for (i = 0; i < 100; i++) | 119 | for (i = 0; i < 100; i++) |
118 | GNUNET_CONTAINER_slist_add_end (l, | 120 | GNUNET_CONTAINER_slist_add_end (l, |
119 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, | 121 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, |
120 | &i, sizeof (i)); | 122 | &i, sizeof (i)); |
121 | 123 | ||
122 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 100); | 124 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 100); |
123 | 125 | ||
124 | for (it = GNUNET_CONTAINER_slist_begin (l), i = 0; | 126 | for (it = GNUNET_CONTAINER_slist_begin (l), i = 0; |
125 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES; | 127 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES; |
126 | GNUNET_CONTAINER_slist_next (it), i++) | 128 | GNUNET_CONTAINER_slist_next (it), i++) |
127 | { | ||
128 | p = GNUNET_CONTAINER_slist_get (it, &s); | ||
129 | |||
130 | if ((p == NULL) || (i != *(int *) p) || (s != sizeof (i))) | ||
131 | { | 129 | { |
132 | GNUNET_CONTAINER_slist_iter_destroy (it); | 130 | p = GNUNET_CONTAINER_slist_get (it, &s); |
133 | GNUNET_assert (0); | 131 | |
132 | if ((p == NULL) || (i != *(int *) p) || (s != sizeof (i))) | ||
133 | { | ||
134 | GNUNET_CONTAINER_slist_iter_destroy (it); | ||
135 | GNUNET_assert (0); | ||
136 | } | ||
134 | } | 137 | } |
135 | } | ||
136 | GNUNET_CONTAINER_slist_iter_destroy (it); | 138 | GNUNET_CONTAINER_slist_iter_destroy (it); |
137 | GNUNET_CONTAINER_slist_destroy (l); | 139 | GNUNET_CONTAINER_slist_destroy (l); |
138 | 140 | ||
@@ -140,12 +142,13 @@ main (int argc, char *argv[]) | |||
140 | l = GNUNET_CONTAINER_slist_create (); | 142 | l = GNUNET_CONTAINER_slist_create (); |
141 | 143 | ||
142 | for (i = 0; i < 100; i++) | 144 | for (i = 0; i < 100; i++) |
143 | { | 145 | { |
144 | ip = GNUNET_malloc (sizeof (int)); | 146 | ip = GNUNET_malloc (sizeof (int)); |
145 | *ip = i; | 147 | *ip = i; |
146 | GNUNET_CONTAINER_slist_add (l, GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC, | 148 | GNUNET_CONTAINER_slist_add (l, |
147 | ip, sizeof (int)); | 149 | GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC, |
148 | } | 150 | ip, sizeof (int)); |
151 | } | ||
149 | //creat_add | 152 | //creat_add |
150 | it = GNUNET_CONTAINER_slist_begin (l); | 153 | it = GNUNET_CONTAINER_slist_begin (l); |
151 | p = GNUNET_CONTAINER_slist_get (it, &s); | 154 | p = GNUNET_CONTAINER_slist_get (it, &s); |