X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftest_container_slist.c;h=1b63d3dbce1213294bdbc6cbd0a6d414a5781bf3;hb=72c8645af31896829b674b575c5375706f362a30;hp=394dc4cdb56bee03771910930ef63dd2a09fc5fb;hpb=662b5736c37e8cf2b3e6aa5af53cef0d03b743ab;p=oweals%2Fgnunet.git diff --git a/src/util/test_container_slist.c b/src/util/test_container_slist.c index 394dc4cdb..1b63d3dbc 100644 --- a/src/util/test_container_slist.c +++ b/src/util/test_container_slist.c @@ -46,66 +46,64 @@ main (int argc, char *argv[]) GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 0); for (i = 0; i < 100; i++) - GNUNET_CONTAINER_slist_add (l, - GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, - &i, sizeof (i)); + GNUNET_CONTAINER_slist_add (l, GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, + &i, sizeof (i)); GNUNET_assert (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--) + { + p = GNUNET_CONTAINER_slist_get (&it, &s); + + if ((p == NULL) || (i != (j = *(int *) p)) || (s != sizeof (i))) { - p = GNUNET_CONTAINER_slist_get (&it, &s); - - if ((p == NULL) || (i != (j = *(int *) p)) || (s != sizeof (i))) - { - GNUNET_CONTAINER_slist_iter_destroy (&it); - GNUNET_assert (0); - } - j *= 2; - GNUNET_CONTAINER_slist_insert (&it, - GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, - &j, sizeof (j)); + GNUNET_CONTAINER_slist_iter_destroy (&it); + GNUNET_assert (0); } + j *= 2; + GNUNET_CONTAINER_slist_insert (&it, + GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, + &j, sizeof (j)); + } GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 200); i = 198; GNUNET_assert (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i))); for (it = GNUNET_CONTAINER_slist_begin (l); GNUNET_CONTAINER_slist_end (&it) != GNUNET_YES;) - { - p = GNUNET_CONTAINER_slist_get (&it, &s); - GNUNET_assert (p != NULL); - GNUNET_assert (s == sizeof (i)); - i = *(int *) p; + { + p = GNUNET_CONTAINER_slist_get (&it, &s); + GNUNET_assert (p != NULL); + GNUNET_assert (s == sizeof (i)); + i = *(int *) p; - GNUNET_assert (GNUNET_CONTAINER_slist_next (&it) == GNUNET_YES); - GNUNET_assert (GNUNET_CONTAINER_slist_end (&it) != GNUNET_YES); + GNUNET_assert (GNUNET_CONTAINER_slist_next (&it) == GNUNET_YES); + GNUNET_assert (GNUNET_CONTAINER_slist_end (&it) != GNUNET_YES); - p = GNUNET_CONTAINER_slist_get (&it, &s); - GNUNET_assert (p != NULL); - GNUNET_assert (s == sizeof (j)); - j = *(int *) p; + p = GNUNET_CONTAINER_slist_get (&it, &s); + GNUNET_assert (p != NULL); + GNUNET_assert (s == sizeof (j)); + j = *(int *) p; - GNUNET_assert (j * 2 == i); + GNUNET_assert (j * 2 == i); - GNUNET_CONTAINER_slist_erase (&it); - } + GNUNET_CONTAINER_slist_erase (&it); + } GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 100); i = 99; GNUNET_assert (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == - GNUNET_NO); + GNUNET_NO); i = 198; GNUNET_assert (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == - GNUNET_YES); + GNUNET_YES); GNUNET_CONTAINER_slist_clear (l); GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 0); for (i = 0; i < 100; i++) - GNUNET_CONTAINER_slist_add (l, - GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, - &i, sizeof (i)); + GNUNET_CONTAINER_slist_add (l, GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, + &i, sizeof (i)); /*check slist_append */ GNUNET_CONTAINER_slist_append (l, l); GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 200); @@ -116,35 +114,34 @@ main (int argc, char *argv[]) l = GNUNET_CONTAINER_slist_create (); for (i = 0; i < 100; i++) GNUNET_CONTAINER_slist_add_end (l, - GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, - &i, sizeof (i)); + GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, + &i, sizeof (i)); GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 100); for (it = GNUNET_CONTAINER_slist_begin (l), i = 0; GNUNET_CONTAINER_slist_end (&it) != GNUNET_YES; GNUNET_CONTAINER_slist_next (&it), i++) - { - p = GNUNET_CONTAINER_slist_get (&it, &s); + { + p = GNUNET_CONTAINER_slist_get (&it, &s); - if ((p == NULL) || (i != *(int *) p) || (s != sizeof (i))) - { - GNUNET_assert (0); - } + if ((p == NULL) || (i != *(int *) p) || (s != sizeof (i))) + { + GNUNET_assert (0); } + } GNUNET_CONTAINER_slist_destroy (l); /*check if disp = GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC */ l = GNUNET_CONTAINER_slist_create (); for (i = 0; i < 100; i++) - { - ip = GNUNET_malloc (sizeof (int)); - *ip = i; - GNUNET_CONTAINER_slist_add (l, - GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC, - ip, sizeof (int)); - } + { + ip = GNUNET_malloc (sizeof (int)); + *ip = i; + GNUNET_CONTAINER_slist_add (l, GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC, + ip, sizeof (int)); + } //creat_add it = GNUNET_CONTAINER_slist_begin (l); p = GNUNET_CONTAINER_slist_get (&it, &s);