diff options
Diffstat (limited to 'src/include/gnunet_container_lib.h')
-rw-r--r-- | src/include/gnunet_container_lib.h | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h index f3325a064..8d8cbf4c1 100644 --- a/src/include/gnunet_container_lib.h +++ b/src/include/gnunet_container_lib.h | |||
@@ -2158,9 +2158,9 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy ( | |||
2158 | (element)->next = (head); \ | 2158 | (element)->next = (head); \ |
2159 | (element)->prev = NULL; \ | 2159 | (element)->prev = NULL; \ |
2160 | if ((tail) == NULL) \ | 2160 | if ((tail) == NULL) \ |
2161 | (tail) = element; \ | 2161 | (tail) = element; \ |
2162 | else \ | 2162 | else \ |
2163 | (head)->prev = element; \ | 2163 | (head)->prev = element; \ |
2164 | (head) = (element); \ | 2164 | (head) = (element); \ |
2165 | } while (0) | 2165 | } while (0) |
2166 | 2166 | ||
@@ -2182,9 +2182,9 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy ( | |||
2182 | (element)->prev = (tail); \ | 2182 | (element)->prev = (tail); \ |
2183 | (element)->next = NULL; \ | 2183 | (element)->next = NULL; \ |
2184 | if ((head) == NULL) \ | 2184 | if ((head) == NULL) \ |
2185 | (head) = element; \ | 2185 | (head) = element; \ |
2186 | else \ | 2186 | else \ |
2187 | (tail)->next = element; \ | 2187 | (tail)->next = element; \ |
2188 | (tail) = (element); \ | 2188 | (tail) = (element); \ |
2189 | } while (0) | 2189 | } while (0) |
2190 | 2190 | ||
@@ -2216,9 +2216,9 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy ( | |||
2216 | (other)->next = (element); \ | 2216 | (other)->next = (element); \ |
2217 | } \ | 2217 | } \ |
2218 | if (NULL == (element)->next) \ | 2218 | if (NULL == (element)->next) \ |
2219 | (tail) = (element); \ | 2219 | (tail) = (element); \ |
2220 | else \ | 2220 | else \ |
2221 | (element)->next->prev = (element); \ | 2221 | (element)->next->prev = (element); \ |
2222 | } while (0) | 2222 | } while (0) |
2223 | 2223 | ||
2224 | 2224 | ||
@@ -2249,9 +2249,9 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy ( | |||
2249 | (other)->prev = (element); \ | 2249 | (other)->prev = (element); \ |
2250 | } \ | 2250 | } \ |
2251 | if (NULL == (element)->prev) \ | 2251 | if (NULL == (element)->prev) \ |
2252 | (head) = (element); \ | 2252 | (head) = (element); \ |
2253 | else \ | 2253 | else \ |
2254 | (element)->prev->next = (element); \ | 2254 | (element)->prev->next = (element); \ |
2255 | } while (0) | 2255 | } while (0) |
2256 | 2256 | ||
2257 | 2257 | ||
@@ -2275,13 +2275,13 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy ( | |||
2275 | GNUNET_assert (((element)->prev != NULL) || ((head) == (element))); \ | 2275 | GNUNET_assert (((element)->prev != NULL) || ((head) == (element))); \ |
2276 | GNUNET_assert (((element)->next != NULL) || ((tail) == (element))); \ | 2276 | GNUNET_assert (((element)->next != NULL) || ((tail) == (element))); \ |
2277 | if ((element)->prev == NULL) \ | 2277 | if ((element)->prev == NULL) \ |
2278 | (head) = (element)->next; \ | 2278 | (head) = (element)->next; \ |
2279 | else \ | 2279 | else \ |
2280 | (element)->prev->next = (element)->next; \ | 2280 | (element)->prev->next = (element)->next; \ |
2281 | if ((element)->next == NULL) \ | 2281 | if ((element)->next == NULL) \ |
2282 | (tail) = (element)->prev; \ | 2282 | (tail) = (element)->prev; \ |
2283 | else \ | 2283 | else \ |
2284 | (element)->next->prev = (element)->prev; \ | 2284 | (element)->next->prev = (element)->prev; \ |
2285 | (element)->next = NULL; \ | 2285 | (element)->next = NULL; \ |
2286 | (element)->prev = NULL; \ | 2286 | (element)->prev = NULL; \ |
2287 | } while (0) | 2287 | } while (0) |
@@ -2308,9 +2308,9 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy ( | |||
2308 | (element)->next_ ## mdll = (head); \ | 2308 | (element)->next_ ## mdll = (head); \ |
2309 | (element)->prev_ ## mdll = NULL; \ | 2309 | (element)->prev_ ## mdll = NULL; \ |
2310 | if ((tail) == NULL) \ | 2310 | if ((tail) == NULL) \ |
2311 | (tail) = element; \ | 2311 | (tail) = element; \ |
2312 | else \ | 2312 | else \ |
2313 | (head)->prev_ ## mdll = element; \ | 2313 | (head)->prev_ ## mdll = element; \ |
2314 | (head) = (element); \ | 2314 | (head) = (element); \ |
2315 | } while (0) | 2315 | } while (0) |
2316 | 2316 | ||
@@ -2333,9 +2333,9 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy ( | |||
2333 | (element)->prev_ ## mdll = (tail); \ | 2333 | (element)->prev_ ## mdll = (tail); \ |
2334 | (element)->next_ ## mdll = NULL; \ | 2334 | (element)->next_ ## mdll = NULL; \ |
2335 | if ((head) == NULL) \ | 2335 | if ((head) == NULL) \ |
2336 | (head) = element; \ | 2336 | (head) = element; \ |
2337 | else \ | 2337 | else \ |
2338 | (tail)->next_ ## mdll = element; \ | 2338 | (tail)->next_ ## mdll = element; \ |
2339 | (tail) = (element); \ | 2339 | (tail) = (element); \ |
2340 | } while (0) | 2340 | } while (0) |
2341 | 2341 | ||
@@ -2368,9 +2368,9 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy ( | |||
2368 | (other)->next_ ## mdll = (element); \ | 2368 | (other)->next_ ## mdll = (element); \ |
2369 | } \ | 2369 | } \ |
2370 | if (NULL == (element)->next_ ## mdll) \ | 2370 | if (NULL == (element)->next_ ## mdll) \ |
2371 | (tail) = (element); \ | 2371 | (tail) = (element); \ |
2372 | else \ | 2372 | else \ |
2373 | (element)->next_ ## mdll->prev_ ## mdll = (element); \ | 2373 | (element)->next_ ## mdll->prev_ ## mdll = (element); \ |
2374 | } while (0) | 2374 | } while (0) |
2375 | 2375 | ||
2376 | 2376 | ||
@@ -2402,9 +2402,9 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy ( | |||
2402 | (other)->prev_ ## mdll = (element); \ | 2402 | (other)->prev_ ## mdll = (element); \ |
2403 | } \ | 2403 | } \ |
2404 | if (NULL == (element)->prev_ ## mdll) \ | 2404 | if (NULL == (element)->prev_ ## mdll) \ |
2405 | (head) = (element); \ | 2405 | (head) = (element); \ |
2406 | else \ | 2406 | else \ |
2407 | (element)->prev_ ## mdll->next_ ## mdll = (element); \ | 2407 | (element)->prev_ ## mdll->next_ ## mdll = (element); \ |
2408 | } while (0) | 2408 | } while (0) |
2409 | 2409 | ||
2410 | 2410 | ||
@@ -2425,13 +2425,13 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy ( | |||
2425 | GNUNET_assert (((element)->prev_ ## mdll != NULL) || ((head) == (element))); \ | 2425 | GNUNET_assert (((element)->prev_ ## mdll != NULL) || ((head) == (element))); \ |
2426 | GNUNET_assert (((element)->next_ ## mdll != NULL) || ((tail) == (element))); \ | 2426 | GNUNET_assert (((element)->next_ ## mdll != NULL) || ((tail) == (element))); \ |
2427 | if ((element)->prev_ ## mdll == NULL) \ | 2427 | if ((element)->prev_ ## mdll == NULL) \ |
2428 | (head) = (element)->next_ ## mdll; \ | 2428 | (head) = (element)->next_ ## mdll; \ |
2429 | else \ | 2429 | else \ |
2430 | (element)->prev_ ## mdll->next_ ## mdll = (element)->next_ ## mdll; \ | 2430 | (element)->prev_ ## mdll->next_ ## mdll = (element)->next_ ## mdll; \ |
2431 | if ((element)->next_ ## mdll == NULL) \ | 2431 | if ((element)->next_ ## mdll == NULL) \ |
2432 | (tail) = (element)->prev_ ## mdll; \ | 2432 | (tail) = (element)->prev_ ## mdll; \ |
2433 | else \ | 2433 | else \ |
2434 | (element)->next_ ## mdll->prev_ ## mdll = (element)->prev_ ## mdll; \ | 2434 | (element)->next_ ## mdll->prev_ ## mdll = (element)->prev_ ## mdll; \ |
2435 | (element)->next_ ## mdll = NULL; \ | 2435 | (element)->next_ ## mdll = NULL; \ |
2436 | (element)->prev_ ## mdll = NULL; \ | 2436 | (element)->prev_ ## mdll = NULL; \ |
2437 | } while (0) | 2437 | } while (0) |
@@ -2468,8 +2468,8 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy ( | |||
2468 | TYPE *pos; \ | 2468 | TYPE *pos; \ |
2469 | \ | 2469 | \ |
2470 | for (pos = head; NULL != pos; pos = pos->next) \ | 2470 | for (pos = head; NULL != pos; pos = pos->next) \ |
2471 | if (0 < comparator (comparator_cls, element, pos)) \ | 2471 | if (0 < comparator (comparator_cls, element, pos)) \ |
2472 | break; /* element < pos */ \ | 2472 | break; /* element < pos */ \ |
2473 | if (NULL == pos) /* => element > tail */ \ | 2473 | if (NULL == pos) /* => element > tail */ \ |
2474 | { \ | 2474 | { \ |
2475 | GNUNET_CONTAINER_DLL_insert_tail (head, tail, element); \ | 2475 | GNUNET_CONTAINER_DLL_insert_tail (head, tail, element); \ |