diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-03-11 16:58:27 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-03-11 16:58:27 +0000 |
commit | 562b33143ee9fa431a68ea6741e4feb3ba388f83 (patch) | |
tree | 6318eb2c56ff76730708a4791804842c63cf1f81 /src/util | |
parent | 64821d4ae43b03b30de3dd136137598c0d5a2ab2 (diff) | |
download | gnunet-562b33143ee9fa431a68ea6741e4feb3ba388f83.tar.gz gnunet-562b33143ee9fa431a68ea6741e4feb3ba388f83.zip |
changing heap remove node api to not pass heap; more fs hacking
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/Makefile.am | 5 | ||||
-rw-r--r-- | src/util/container_heap.c | 22 | ||||
-rw-r--r-- | src/util/test_container_heap.c | 72 |
3 files changed, 53 insertions, 46 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 9b43b5f05..b24b3ab7c 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am | |||
@@ -92,7 +92,7 @@ gnunet_service_resolver_LDADD = \ | |||
92 | $(GN_LIBINTL) | 92 | $(GN_LIBINTL) |
93 | gnunet_service_resolver_DEPENDENCIES = \ | 93 | gnunet_service_resolver_DEPENDENCIES = \ |
94 | libgnunetutil.la | 94 | libgnunetutil.la |
95 | 95 | ||
96 | 96 | ||
97 | gnunet_resolver_SOURCES = \ | 97 | gnunet_resolver_SOURCES = \ |
98 | gnunet-resolver.c | 98 | gnunet-resolver.c |
@@ -229,7 +229,8 @@ test_crypto_aes_LDADD = \ | |||
229 | test_crypto_aes_weak_SOURCES = \ | 229 | test_crypto_aes_weak_SOURCES = \ |
230 | test_crypto_aes_weak.c | 230 | test_crypto_aes_weak.c |
231 | test_crypto_aes_weak_LDADD = \ | 231 | test_crypto_aes_weak_LDADD = \ |
232 | $(top_builddir)/src/util/libgnunetutil.la | 232 | $(top_builddir)/src/util/libgnunetutil.la \ |
233 | -lgcrypt | ||
233 | 234 | ||
234 | test_crypto_crc_SOURCES = \ | 235 | test_crypto_crc_SOURCES = \ |
235 | test_crypto_crc.c | 236 | test_crypto_crc.c |
diff --git a/src/util/container_heap.c b/src/util/container_heap.c index 7cd30a0a7..c332cdd63 100644 --- a/src/util/container_heap.c +++ b/src/util/container_heap.c | |||
@@ -37,6 +37,11 @@ | |||
37 | struct GNUNET_CONTAINER_HeapNode | 37 | struct GNUNET_CONTAINER_HeapNode |
38 | { | 38 | { |
39 | /** | 39 | /** |
40 | * Heap this node belongs to. | ||
41 | */ | ||
42 | struct GNUNET_CONTAINER_Heap *heap; | ||
43 | |||
44 | /** | ||
40 | * Parent node. | 45 | * Parent node. |
41 | */ | 46 | */ |
42 | struct GNUNET_CONTAINER_HeapNode *parent; | 47 | struct GNUNET_CONTAINER_HeapNode *parent; |
@@ -340,6 +345,7 @@ GNUNET_CONTAINER_heap_insert (struct GNUNET_CONTAINER_Heap *heap, | |||
340 | struct GNUNET_CONTAINER_HeapNode *node; | 345 | struct GNUNET_CONTAINER_HeapNode *node; |
341 | 346 | ||
342 | node = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_HeapNode)); | 347 | node = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_HeapNode)); |
348 | node->heap = heap; | ||
343 | node->element = element; | 349 | node->element = element; |
344 | node->cost = cost; | 350 | node->cost = cost; |
345 | heap->size++; | 351 | heap->size++; |
@@ -405,10 +411,10 @@ GNUNET_CONTAINER_heap_remove_root (struct GNUNET_CONTAINER_Heap *heap) | |||
405 | * 'size' field of the tree. | 411 | * 'size' field of the tree. |
406 | */ | 412 | */ |
407 | static void | 413 | static void |
408 | remove_node (struct GNUNET_CONTAINER_Heap *heap, | 414 | remove_node (struct GNUNET_CONTAINER_HeapNode *node) |
409 | struct GNUNET_CONTAINER_HeapNode *node) | ||
410 | { | 415 | { |
411 | struct GNUNET_CONTAINER_HeapNode *ancestor; | 416 | struct GNUNET_CONTAINER_HeapNode *ancestor; |
417 | struct GNUNET_CONTAINER_Heap *heap = node->heap; | ||
412 | 418 | ||
413 | /* update 'size' of the ancestors */ | 419 | /* update 'size' of the ancestors */ |
414 | ancestor = node; | 420 | ancestor = node; |
@@ -471,20 +477,20 @@ remove_node (struct GNUNET_CONTAINER_Heap *heap, | |||
471 | /** | 477 | /** |
472 | * Removes a node from the heap. | 478 | * Removes a node from the heap. |
473 | * | 479 | * |
474 | * @param heap heap to modify | ||
475 | * @param node node to remove | 480 | * @param node node to remove |
476 | * @return element data stored at the node | 481 | * @return element data stored at the node |
477 | */ | 482 | */ |
478 | void * | 483 | void * |
479 | GNUNET_CONTAINER_heap_remove_node (struct GNUNET_CONTAINER_Heap *heap, | 484 | GNUNET_CONTAINER_heap_remove_node (struct GNUNET_CONTAINER_HeapNode *node) |
480 | struct GNUNET_CONTAINER_HeapNode *node) | ||
481 | { | 485 | { |
482 | void *ret; | 486 | void *ret; |
483 | 487 | struct GNUNET_CONTAINER_Heap *heap; | |
488 | |||
489 | heap = node->heap; | ||
484 | CHECK (heap->root); | 490 | CHECK (heap->root); |
485 | if (heap->walk_pos == node) | 491 | if (heap->walk_pos == node) |
486 | (void) GNUNET_CONTAINER_heap_walk_get_next (heap); | 492 | (void) GNUNET_CONTAINER_heap_walk_get_next (heap); |
487 | remove_node (heap, node); | 493 | remove_node (node); |
488 | heap->size--; | 494 | heap->size--; |
489 | ret = node->element; | 495 | ret = node->element; |
490 | if (heap->walk_pos == node) | 496 | if (heap->walk_pos == node) |
@@ -518,7 +524,7 @@ GNUNET_CONTAINER_heap_update_cost (struct GNUNET_CONTAINER_Heap *heap, | |||
518 | (heap->size == heap->root->tree_size + 1) ); | 524 | (heap->size == heap->root->tree_size + 1) ); |
519 | CHECK (heap->root); | 525 | CHECK (heap->root); |
520 | #endif | 526 | #endif |
521 | remove_node (heap, node); | 527 | remove_node (node); |
522 | #if DEBUG | 528 | #if DEBUG |
523 | CHECK (heap->root); | 529 | CHECK (heap->root); |
524 | GNUNET_assert ( ( (heap->size == 1) && | 530 | GNUNET_assert ( ( (heap->size == 1) && |
diff --git a/src/util/test_container_heap.c b/src/util/test_container_heap.c index 87bc49129..6a0d5d68d 100644 --- a/src/util/test_container_heap.c +++ b/src/util/test_container_heap.c | |||
@@ -93,7 +93,7 @@ check () | |||
93 | n2 = GNUNET_CONTAINER_heap_insert (myHeap, "78", 78); | 93 | n2 = GNUNET_CONTAINER_heap_insert (myHeap, "78", 78); |
94 | GNUNET_assert (2 == GNUNET_CONTAINER_heap_get_size (myHeap)); | 94 | GNUNET_assert (2 == GNUNET_CONTAINER_heap_get_size (myHeap)); |
95 | GNUNET_assert (0 == strcmp ("78", | 95 | GNUNET_assert (0 == strcmp ("78", |
96 | GNUNET_CONTAINER_heap_remove_node (myHeap, n2))); | 96 | GNUNET_CONTAINER_heap_remove_node (n2))); |
97 | GNUNET_assert (1 == GNUNET_CONTAINER_heap_get_size (myHeap)); | 97 | GNUNET_assert (1 == GNUNET_CONTAINER_heap_get_size (myHeap)); |
98 | GNUNET_CONTAINER_heap_iterate (myHeap, &iterator_callback, NULL); | 98 | GNUNET_CONTAINER_heap_iterate (myHeap, &iterator_callback, NULL); |
99 | 99 | ||
@@ -110,13 +110,13 @@ check () | |||
110 | n5 = GNUNET_CONTAINER_heap_insert (myHeap, "100", 100); | 110 | n5 = GNUNET_CONTAINER_heap_insert (myHeap, "100", 100); |
111 | n6 = GNUNET_CONTAINER_heap_insert (myHeap, "30/200", 30); | 111 | n6 = GNUNET_CONTAINER_heap_insert (myHeap, "30/200", 30); |
112 | GNUNET_assert (5 == GNUNET_CONTAINER_heap_get_size (myHeap)); | 112 | GNUNET_assert (5 == GNUNET_CONTAINER_heap_get_size (myHeap)); |
113 | GNUNET_CONTAINER_heap_remove_node (myHeap, n5); | 113 | GNUNET_CONTAINER_heap_remove_node (n5); |
114 | r = GNUNET_CONTAINER_heap_remove_root (myHeap); /* n1 */ | 114 | r = GNUNET_CONTAINER_heap_remove_root (myHeap); /* n1 */ |
115 | GNUNET_assert (NULL != r); | 115 | GNUNET_assert (NULL != r); |
116 | GNUNET_assert (0 == strcmp ("11", | 116 | GNUNET_assert (0 == strcmp ("11", |
117 | r)); | 117 | r)); |
118 | GNUNET_CONTAINER_heap_update_cost (myHeap, n6, 200); | 118 | GNUNET_CONTAINER_heap_update_cost (myHeap, n6, 200); |
119 | GNUNET_CONTAINER_heap_remove_node (myHeap, n3); | 119 | GNUNET_CONTAINER_heap_remove_node (n3); |
120 | r = GNUNET_CONTAINER_heap_remove_root (myHeap); /* n4 */ | 120 | r = GNUNET_CONTAINER_heap_remove_root (myHeap); /* n4 */ |
121 | GNUNET_assert (NULL != r); | 121 | GNUNET_assert (NULL != r); |
122 | GNUNET_assert (0 == strcmp ("50", | 122 | GNUNET_assert (0 == strcmp ("50", |
@@ -137,7 +137,7 @@ check () | |||
137 | n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); | 137 | n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); |
138 | GNUNET_CONTAINER_heap_update_cost (myHeap, n1, 15); | 138 | GNUNET_CONTAINER_heap_update_cost (myHeap, n1, 15); |
139 | 139 | ||
140 | r = GNUNET_CONTAINER_heap_remove_node (myHeap,n1); | 140 | r = GNUNET_CONTAINER_heap_remove_node (n1); |
141 | GNUNET_assert (NULL != r); | 141 | GNUNET_assert (NULL != r); |
142 | GNUNET_assert (0 == strcmp ("10", r)); | 142 | GNUNET_assert (0 == strcmp ("10", r)); |
143 | 143 | ||
@@ -145,10 +145,10 @@ check () | |||
145 | n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10); | 145 | n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10); |
146 | 146 | ||
147 | GNUNET_CONTAINER_heap_walk_get_next (myHeap); | 147 | GNUNET_CONTAINER_heap_walk_get_next (myHeap); |
148 | r = GNUNET_CONTAINER_heap_remove_node (myHeap,n2); | 148 | r = GNUNET_CONTAINER_heap_remove_node (n2); |
149 | GNUNET_assert (NULL != r); | 149 | GNUNET_assert (NULL != r); |
150 | GNUNET_assert (0 == strcmp ("20", r)); | 150 | GNUNET_assert (0 == strcmp ("20", r)); |
151 | r = GNUNET_CONTAINER_heap_remove_node (myHeap,n1); | 151 | r = GNUNET_CONTAINER_heap_remove_node (n1); |
152 | GNUNET_assert (NULL != r); | 152 | GNUNET_assert (NULL != r); |
153 | GNUNET_assert (0 == strcmp ("10", r)); | 153 | GNUNET_assert (0 == strcmp ("10", r)); |
154 | 154 | ||
@@ -156,8 +156,8 @@ check () | |||
156 | n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10); | 156 | n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10); |
157 | n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 10); | 157 | n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 10); |
158 | 158 | ||
159 | GNUNET_CONTAINER_heap_remove_node (myHeap,n2); | 159 | GNUNET_CONTAINER_heap_remove_node (n2); |
160 | GNUNET_CONTAINER_heap_remove_node (myHeap,n1); | 160 | GNUNET_CONTAINER_heap_remove_node (n1); |
161 | r = GNUNET_CONTAINER_heap_remove_root (myHeap); | 161 | r = GNUNET_CONTAINER_heap_remove_root (myHeap); |
162 | GNUNET_assert (NULL != r); | 162 | GNUNET_assert (NULL != r); |
163 | GNUNET_assert (0 == strcmp ("30", r)); | 163 | GNUNET_assert (0 == strcmp ("30", r)); |
@@ -166,9 +166,9 @@ check () | |||
166 | n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10); | 166 | n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10); |
167 | n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 10); | 167 | n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 10); |
168 | 168 | ||
169 | GNUNET_CONTAINER_heap_remove_node (myHeap,n2); | 169 | GNUNET_CONTAINER_heap_remove_node (n2); |
170 | GNUNET_CONTAINER_heap_remove_node (myHeap,n1); | 170 | GNUNET_CONTAINER_heap_remove_node (n1); |
171 | r = GNUNET_CONTAINER_heap_remove_node (myHeap, n3); | 171 | r = GNUNET_CONTAINER_heap_remove_node ( n3); |
172 | GNUNET_assert (NULL != r); | 172 | GNUNET_assert (NULL != r); |
173 | GNUNET_assert (0 == strcmp ("30", r)); | 173 | GNUNET_assert (0 == strcmp ("30", r)); |
174 | 174 | ||
@@ -176,7 +176,7 @@ check () | |||
176 | n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 20); | 176 | n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 20); |
177 | n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 30); | 177 | n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 30); |
178 | 178 | ||
179 | GNUNET_assert (0 == nstrcmp ("20", GNUNET_CONTAINER_heap_remove_node (myHeap,n2))); | 179 | GNUNET_assert (0 == nstrcmp ("20", GNUNET_CONTAINER_heap_remove_node (n2))); |
180 | GNUNET_assert (0 == nstrcmp ("10", GNUNET_CONTAINER_heap_remove_root (myHeap))); | 180 | GNUNET_assert (0 == nstrcmp ("10", GNUNET_CONTAINER_heap_remove_root (myHeap))); |
181 | GNUNET_assert (0 == nstrcmp ("30", GNUNET_CONTAINER_heap_remove_root (myHeap))); | 181 | GNUNET_assert (0 == nstrcmp ("30", GNUNET_CONTAINER_heap_remove_root (myHeap))); |
182 | 182 | ||
@@ -191,11 +191,11 @@ check () | |||
191 | n7 = GNUNET_CONTAINER_heap_insert (myHeap, "70", 10); | 191 | n7 = GNUNET_CONTAINER_heap_insert (myHeap, "70", 10); |
192 | n8 = GNUNET_CONTAINER_heap_insert (myHeap, "80", 10); | 192 | n8 = GNUNET_CONTAINER_heap_insert (myHeap, "80", 10); |
193 | 193 | ||
194 | GNUNET_assert (0 == nstrcmp ("30", GNUNET_CONTAINER_heap_remove_node (myHeap,n3))); | 194 | GNUNET_assert (0 == nstrcmp ("30", GNUNET_CONTAINER_heap_remove_node (n3))); |
195 | 195 | ||
196 | // Cleaning up... | 196 | // Cleaning up... |
197 | GNUNET_assert (0 == nstrcmp ("60", GNUNET_CONTAINER_heap_remove_node (myHeap,n6))); | 197 | GNUNET_assert (0 == nstrcmp ("60", GNUNET_CONTAINER_heap_remove_node (n6))); |
198 | GNUNET_assert (0 == nstrcmp ("50", GNUNET_CONTAINER_heap_remove_node (myHeap,n5))); | 198 | GNUNET_assert (0 == nstrcmp ("50", GNUNET_CONTAINER_heap_remove_node (n5))); |
199 | 199 | ||
200 | // Testing heap_walk_get_next | 200 | // Testing heap_walk_get_next |
201 | GNUNET_CONTAINER_heap_walk_get_next (myHeap); | 201 | GNUNET_CONTAINER_heap_walk_get_next (myHeap); |
@@ -204,11 +204,11 @@ check () | |||
204 | GNUNET_CONTAINER_heap_walk_get_next (myHeap); | 204 | GNUNET_CONTAINER_heap_walk_get_next (myHeap); |
205 | GNUNET_CONTAINER_heap_walk_get_next (myHeap); | 205 | GNUNET_CONTAINER_heap_walk_get_next (myHeap); |
206 | 206 | ||
207 | GNUNET_assert (0 == nstrcmp ("10", GNUNET_CONTAINER_heap_remove_node (myHeap,n1))); | 207 | GNUNET_assert (0 == nstrcmp ("10", GNUNET_CONTAINER_heap_remove_node (n1))); |
208 | GNUNET_assert (0 == nstrcmp ("20", GNUNET_CONTAINER_heap_remove_node (myHeap,n2))); | 208 | GNUNET_assert (0 == nstrcmp ("20", GNUNET_CONTAINER_heap_remove_node (n2))); |
209 | GNUNET_assert (0 == nstrcmp ("40", GNUNET_CONTAINER_heap_remove_node (myHeap,n4))); | 209 | GNUNET_assert (0 == nstrcmp ("40", GNUNET_CONTAINER_heap_remove_node (n4))); |
210 | GNUNET_assert (0 == nstrcmp ("70", GNUNET_CONTAINER_heap_remove_node (myHeap,n7))); | 210 | GNUNET_assert (0 == nstrcmp ("70", GNUNET_CONTAINER_heap_remove_node (n7))); |
211 | GNUNET_assert (0 == nstrcmp ("80", GNUNET_CONTAINER_heap_remove_node (myHeap,n8))); | 211 | GNUNET_assert (0 == nstrcmp ("80", GNUNET_CONTAINER_heap_remove_node (n8))); |
212 | 212 | ||
213 | // End Testing remove_node | 213 | // End Testing remove_node |
214 | 214 | ||
@@ -220,30 +220,30 @@ check () | |||
220 | n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); | 220 | n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); |
221 | GNUNET_CONTAINER_heap_update_cost (myHeap, n1, 15); | 221 | GNUNET_CONTAINER_heap_update_cost (myHeap, n1, 15); |
222 | 222 | ||
223 | GNUNET_assert (0 == nstrcmp ("10", GNUNET_CONTAINER_heap_remove_node (myHeap,n1))); | 223 | GNUNET_assert (0 == nstrcmp ("10", GNUNET_CONTAINER_heap_remove_node (n1))); |
224 | 224 | ||
225 | n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); | 225 | n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); |
226 | n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10); | 226 | n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10); |
227 | 227 | ||
228 | GNUNET_CONTAINER_heap_walk_get_next (myHeap); | 228 | GNUNET_CONTAINER_heap_walk_get_next (myHeap); |
229 | GNUNET_assert (0 == nstrcmp ("20", GNUNET_CONTAINER_heap_remove_node (myHeap,n2))); | 229 | GNUNET_assert (0 == nstrcmp ("20", GNUNET_CONTAINER_heap_remove_node (n2))); |
230 | GNUNET_assert (0 == nstrcmp ("10", GNUNET_CONTAINER_heap_remove_node (myHeap,n1))); | 230 | GNUNET_assert (0 == nstrcmp ("10", GNUNET_CONTAINER_heap_remove_node (n1))); |
231 | 231 | ||
232 | n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); | 232 | n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); |
233 | n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10); | 233 | n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10); |
234 | n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 10); | 234 | n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 10); |
235 | 235 | ||
236 | GNUNET_CONTAINER_heap_remove_node (myHeap,n2); | 236 | GNUNET_CONTAINER_heap_remove_node (n2); |
237 | GNUNET_CONTAINER_heap_remove_node (myHeap,n1); | 237 | GNUNET_CONTAINER_heap_remove_node (n1); |
238 | GNUNET_assert (0 == nstrcmp ("30", GNUNET_CONTAINER_heap_remove_root (myHeap))); | 238 | GNUNET_assert (0 == nstrcmp ("30", GNUNET_CONTAINER_heap_remove_root (myHeap))); |
239 | 239 | ||
240 | n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); | 240 | n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); |
241 | n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10); | 241 | n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10); |
242 | n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 10); | 242 | n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 10); |
243 | 243 | ||
244 | GNUNET_CONTAINER_heap_remove_node (myHeap,n2); | 244 | GNUNET_CONTAINER_heap_remove_node (n2); |
245 | GNUNET_CONTAINER_heap_remove_node (myHeap,n1); | 245 | GNUNET_CONTAINER_heap_remove_node (n1); |
246 | GNUNET_assert (0 == nstrcmp ("30", GNUNET_CONTAINER_heap_remove_node (myHeap,n3))); | 246 | GNUNET_assert (0 == nstrcmp ("30", GNUNET_CONTAINER_heap_remove_node (n3))); |
247 | 247 | ||
248 | n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); | 248 | n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); |
249 | n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 20); | 249 | n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 20); |
@@ -256,11 +256,11 @@ check () | |||
256 | n7 = GNUNET_CONTAINER_heap_insert (myHeap, "70", 10); | 256 | n7 = GNUNET_CONTAINER_heap_insert (myHeap, "70", 10); |
257 | n8 = GNUNET_CONTAINER_heap_insert (myHeap, "80", 10); | 257 | n8 = GNUNET_CONTAINER_heap_insert (myHeap, "80", 10); |
258 | 258 | ||
259 | GNUNET_assert (0 == nstrcmp ("30", GNUNET_CONTAINER_heap_remove_node (myHeap,n3))); | 259 | GNUNET_assert (0 == nstrcmp ("30", GNUNET_CONTAINER_heap_remove_node (n3))); |
260 | 260 | ||
261 | // Cleaning up... | 261 | // Cleaning up... |
262 | GNUNET_assert (0 == nstrcmp ("60", GNUNET_CONTAINER_heap_remove_node (myHeap,n6))); | 262 | GNUNET_assert (0 == nstrcmp ("60", GNUNET_CONTAINER_heap_remove_node (n6))); |
263 | GNUNET_assert (0 == nstrcmp ("50", GNUNET_CONTAINER_heap_remove_node (myHeap,n5))); | 263 | GNUNET_assert (0 == nstrcmp ("50", GNUNET_CONTAINER_heap_remove_node (n5))); |
264 | 264 | ||
265 | // Testing heap_walk_get_next | 265 | // Testing heap_walk_get_next |
266 | GNUNET_CONTAINER_heap_walk_get_next (myHeap); | 266 | GNUNET_CONTAINER_heap_walk_get_next (myHeap); |
@@ -269,11 +269,11 @@ check () | |||
269 | GNUNET_CONTAINER_heap_walk_get_next (myHeap); | 269 | GNUNET_CONTAINER_heap_walk_get_next (myHeap); |
270 | GNUNET_CONTAINER_heap_walk_get_next (myHeap); | 270 | GNUNET_CONTAINER_heap_walk_get_next (myHeap); |
271 | 271 | ||
272 | GNUNET_assert (0 == nstrcmp ("10", GNUNET_CONTAINER_heap_remove_node (myHeap,n1))); | 272 | GNUNET_assert (0 == nstrcmp ("10", GNUNET_CONTAINER_heap_remove_node (n1))); |
273 | GNUNET_assert (0 == nstrcmp ("20", GNUNET_CONTAINER_heap_remove_node (myHeap,n2))); | 273 | GNUNET_assert (0 == nstrcmp ("20", GNUNET_CONTAINER_heap_remove_node (n2))); |
274 | GNUNET_assert (0 == nstrcmp ("40", GNUNET_CONTAINER_heap_remove_node (myHeap,n4))); | 274 | GNUNET_assert (0 == nstrcmp ("40", GNUNET_CONTAINER_heap_remove_node (n4))); |
275 | GNUNET_assert (0 == nstrcmp ("70", GNUNET_CONTAINER_heap_remove_node (myHeap,n7))); | 275 | GNUNET_assert (0 == nstrcmp ("70", GNUNET_CONTAINER_heap_remove_node (n7))); |
276 | GNUNET_assert (0 == nstrcmp ("80", GNUNET_CONTAINER_heap_remove_node (myHeap,n8))); | 276 | GNUNET_assert (0 == nstrcmp ("80", GNUNET_CONTAINER_heap_remove_node (n8))); |
277 | 277 | ||
278 | // End Testing remove_node | 278 | // End Testing remove_node |
279 | 279 | ||