diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2012-03-21 00:58:14 +1030 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-03-22 01:57:37 +0100 |
commit | 675593221c25dbebaaf8e4ce9f4271a8fb0171d0 (patch) | |
tree | e1f57a9e3919adb163c0acf1072708aca912945a /lib/ccan/list/test/run-single-eval.c | |
parent | eafd83736918bc5953e4a91cf2d893e68f2da2a2 (diff) | |
download | samba-675593221c25dbebaaf8e4ce9f4271a8fb0171d0.tar.gz samba-675593221c25dbebaaf8e4ce9f4271a8fb0171d0.tar.bz2 samba-675593221c25dbebaaf8e4ce9f4271a8fb0171d0.zip |
lib/ccan: namespacize ccan/list to avoid conflict with OpenIndiana's sys/list.h
CCAN includes a little utility called "namespacize" which prepends ccan_ to
all public methods of a module, and fixes up any dependencies it finds. It's
a little primitive, but it works here.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'lib/ccan/list/test/run-single-eval.c')
-rw-r--r-- | lib/ccan/list/test/run-single-eval.c | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/lib/ccan/list/test/run-single-eval.c b/lib/ccan/list/test/run-single-eval.c index f90eed357a..2737bec382 100644 --- a/lib/ccan/list/test/run-single-eval.c +++ b/lib/ccan/list/test/run-single-eval.c @@ -5,17 +5,17 @@ struct parent { const char *name; - struct list_head children; + struct ccan_list_head children; unsigned int num_children; int eval_count; }; struct child { const char *name; - struct list_node list; + struct ccan_list_node list; }; -static LIST_HEAD(static_list); +static CCAN_LIST_HEAD(static_list); #define ref(obj, counter) ((counter)++, (obj)) @@ -26,47 +26,47 @@ int main(int argc, char *argv[]) unsigned int i; unsigned int static_count = 0, parent_count = 0, list_count = 0, node_count = 0; - struct list_head list = LIST_HEAD_INIT(list); + struct ccan_list_head list = CCAN_LIST_HEAD_INIT(list); plan_tests(74); - /* Test LIST_HEAD, LIST_HEAD_INIT, list_empty and check_list */ - ok1(list_empty(ref(&static_list, static_count))); + /* Test CCAN_LIST_HEAD, CCAN_LIST_HEAD_INIT, ccan_list_empty and check_list */ + ok1(ccan_list_empty(ref(&static_list, static_count))); ok1(static_count == 1); - ok1(list_check(ref(&static_list, static_count), NULL)); + ok1(ccan_list_check(ref(&static_list, static_count), NULL)); ok1(static_count == 2); - ok1(list_empty(ref(&list, list_count))); + ok1(ccan_list_empty(ref(&list, list_count))); ok1(list_count == 1); - ok1(list_check(ref(&list, list_count), NULL)); + ok1(ccan_list_check(ref(&list, list_count), NULL)); ok1(list_count == 2); parent.num_children = 0; - list_head_init(ref(&parent.children, parent_count)); + ccan_list_head_init(ref(&parent.children, parent_count)); ok1(parent_count == 1); - /* Test list_head_init */ - ok1(list_empty(ref(&parent.children, parent_count))); + /* Test ccan_list_head_init */ + ok1(ccan_list_empty(ref(&parent.children, parent_count))); ok1(parent_count == 2); - ok1(list_check(ref(&parent.children, parent_count), NULL)); + ok1(ccan_list_check(ref(&parent.children, parent_count), NULL)); ok1(parent_count == 3); c2.name = "c2"; - list_add(ref(&parent.children, parent_count), &c2.list); + ccan_list_add(ref(&parent.children, parent_count), &c2.list); ok1(parent_count == 4); - /* Test list_add and !list_empty. */ - ok1(!list_empty(ref(&parent.children, parent_count))); + /* Test ccan_list_add and !ccan_list_empty. */ + ok1(!ccan_list_empty(ref(&parent.children, parent_count))); ok1(parent_count == 5); ok1(c2.list.next == &parent.children.n); ok1(c2.list.prev == &parent.children.n); ok1(parent.children.n.next == &c2.list); ok1(parent.children.n.prev == &c2.list); - /* Test list_check */ - ok1(list_check(ref(&parent.children, parent_count), NULL)); + /* Test ccan_list_check */ + ok1(ccan_list_check(ref(&parent.children, parent_count), NULL)); ok1(parent_count == 6); c1.name = "c1"; - list_add(ref(&parent.children, parent_count), &c1.list); + ccan_list_add(ref(&parent.children, parent_count), &c1.list); ok1(parent_count == 7); - /* Test list_add and !list_empty. */ - ok1(!list_empty(ref(&parent.children, parent_count))); + /* Test ccan_list_add and !ccan_list_empty. */ + ok1(!ccan_list_empty(ref(&parent.children, parent_count))); ok1(parent_count == 8); ok1(c2.list.next == &parent.children.n); ok1(c2.list.prev == &c1.list); @@ -74,15 +74,15 @@ int main(int argc, char *argv[]) ok1(parent.children.n.prev == &c2.list); ok1(c1.list.next == &c2.list); ok1(c1.list.prev == &parent.children.n); - /* Test list_check */ - ok1(list_check(ref(&parent.children, parent_count), NULL)); + /* Test ccan_list_check */ + ok1(ccan_list_check(ref(&parent.children, parent_count), NULL)); ok1(parent_count == 9); c3.name = "c3"; - list_add_tail(ref(&parent.children, parent_count), &c3.list); + ccan_list_add_tail(ref(&parent.children, parent_count), &c3.list); ok1(parent_count == 10); - /* Test list_add_tail and !list_empty. */ - ok1(!list_empty(ref(&parent.children, parent_count))); + /* Test ccan_list_add_tail and !ccan_list_empty. */ + ok1(!ccan_list_empty(ref(&parent.children, parent_count))); ok1(parent_count == 11); ok1(parent.children.n.next == &c1.list); ok1(parent.children.n.prev == &c3.list); @@ -92,26 +92,26 @@ int main(int argc, char *argv[]) ok1(c2.list.prev == &c1.list); ok1(c3.list.next == &parent.children.n); ok1(c3.list.prev == &c2.list); - /* Test list_check */ - ok1(list_check(ref(&parent.children, parent_count), NULL)); + /* Test ccan_list_check */ + ok1(ccan_list_check(ref(&parent.children, parent_count), NULL)); ok1(parent_count == 12); - /* Test list_check_node */ - ok1(list_check_node(&c1.list, NULL)); - ok1(list_check_node(&c2.list, NULL)); - ok1(list_check_node(&c3.list, NULL)); + /* Test ccan_list_check_node */ + ok1(ccan_list_check_node(&c1.list, NULL)); + ok1(ccan_list_check_node(&c2.list, NULL)); + ok1(ccan_list_check_node(&c3.list, NULL)); - /* Test list_top */ - ok1(list_top(ref(&parent.children, parent_count), struct child, list) == &c1); + /* Test ccan_list_top */ + ok1(ccan_list_top(ref(&parent.children, parent_count), struct child, list) == &c1); ok1(parent_count == 13); - /* Test list_tail */ - ok1(list_tail(ref(&parent.children, parent_count), struct child, list) == &c3); + /* Test ccan_list_tail */ + ok1(ccan_list_tail(ref(&parent.children, parent_count), struct child, list) == &c3); ok1(parent_count == 14); - /* Test list_for_each. */ + /* Test ccan_list_for_each. */ i = 0; - list_for_each(&parent.children, c, list) { + ccan_list_for_each(&parent.children, c, list) { switch (i++) { case 0: ok1(c == &c1); @@ -128,41 +128,41 @@ int main(int argc, char *argv[]) } ok1(i == 3); - /* Test list_for_each_safe, list_del and list_del_from. */ + /* Test ccan_list_for_each_safe, ccan_list_del and ccan_list_del_from. */ i = 0; - list_for_each_safe(&parent.children, c, n, list) { + ccan_list_for_each_safe(&parent.children, c, n, list) { switch (i++) { case 0: ok1(c == &c1); - list_del(ref(&c->list, node_count)); + ccan_list_del(ref(&c->list, node_count)); ok1(node_count == 1); break; case 1: ok1(c == &c2); - list_del_from(ref(&parent.children, parent_count), + ccan_list_del_from(ref(&parent.children, parent_count), ref(&c->list, node_count)); ok1(node_count == 2); break; case 2: ok1(c == &c3); - list_del_from(ref(&parent.children, parent_count), + ccan_list_del_from(ref(&parent.children, parent_count), ref(&c->list, node_count)); ok1(node_count == 3); break; } - ok1(list_check(ref(&parent.children, parent_count), NULL)); + ok1(ccan_list_check(ref(&parent.children, parent_count), NULL)); if (i > 2) break; } ok1(i == 3); ok1(parent_count == 19); - ok1(list_empty(ref(&parent.children, parent_count))); + ok1(ccan_list_empty(ref(&parent.children, parent_count))); ok1(parent_count == 20); - /* Test list_top/list_tail on empty list. */ - ok1(list_top(ref(&parent.children, parent_count), struct child, list) == NULL); + /* Test ccan_list_top/ccan_list_tail on empty list. */ + ok1(ccan_list_top(ref(&parent.children, parent_count), struct child, list) == NULL); ok1(parent_count == 21); - ok1(list_tail(ref(&parent.children, parent_count), struct child, list) == NULL); + ok1(ccan_list_tail(ref(&parent.children, parent_count), struct child, list) == NULL); ok1(parent_count == 22); return exit_status(); } |