From 675593221c25dbebaaf8e4ce9f4271a8fb0171d0 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 21 Mar 2012 00:58:14 +1030 Subject: 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 --- lib/ccan/list/test/run.c | 132 +++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 66 deletions(-) (limited to 'lib/ccan/list/test/run.c') diff --git a/lib/ccan/list/test/run.c b/lib/ccan/list/test/run.c index 952a0e15e6..a93234d655 100644 --- a/lib/ccan/list/test/run.c +++ b/lib/ccan/list/test/run.c @@ -5,67 +5,67 @@ struct parent { const char *name; - struct list_head children; + struct ccan_list_head children; unsigned int num_children; }; 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); int main(int argc, char *argv[]) { struct parent parent; struct child c1, c2, c3, *c, *n; unsigned int i; - struct list_head list = LIST_HEAD_INIT(list); + struct ccan_list_head list = CCAN_LIST_HEAD_INIT(list); opaque_t *q, *nq; - struct list_head opaque_list = LIST_HEAD_INIT(opaque_list); + struct ccan_list_head opaque_list = CCAN_LIST_HEAD_INIT(opaque_list); plan_tests(65); - /* Test LIST_HEAD, LIST_HEAD_INIT, list_empty and check_list */ - ok1(list_empty(&static_list)); - ok1(list_check(&static_list, NULL)); - ok1(list_empty(&list)); - ok1(list_check(&list, NULL)); + /* Test CCAN_LIST_HEAD, CCAN_LIST_HEAD_INIT, ccan_list_empty and check_list */ + ok1(ccan_list_empty(&static_list)); + ok1(ccan_list_check(&static_list, NULL)); + ok1(ccan_list_empty(&list)); + ok1(ccan_list_check(&list, NULL)); parent.num_children = 0; - list_head_init(&parent.children); - /* Test list_head_init */ - ok1(list_empty(&parent.children)); - ok1(list_check(&parent.children, NULL)); + ccan_list_head_init(&parent.children); + /* Test ccan_list_head_init */ + ok1(ccan_list_empty(&parent.children)); + ok1(ccan_list_check(&parent.children, NULL)); c2.name = "c2"; - list_add(&parent.children, &c2.list); - /* Test list_add and !list_empty. */ - ok1(!list_empty(&parent.children)); + ccan_list_add(&parent.children, &c2.list); + /* Test ccan_list_add and !ccan_list_empty. */ + ok1(!ccan_list_empty(&parent.children)); 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(&parent.children, NULL)); + /* Test ccan_list_check */ + ok1(ccan_list_check(&parent.children, NULL)); c1.name = "c1"; - list_add(&parent.children, &c1.list); - /* Test list_add and !list_empty. */ - ok1(!list_empty(&parent.children)); + ccan_list_add(&parent.children, &c1.list); + /* Test ccan_list_add and !ccan_list_empty. */ + ok1(!ccan_list_empty(&parent.children)); ok1(c2.list.next == &parent.children.n); ok1(c2.list.prev == &c1.list); ok1(parent.children.n.next == &c1.list); 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(&parent.children, NULL)); + /* Test ccan_list_check */ + ok1(ccan_list_check(&parent.children, NULL)); c3.name = "c3"; - list_add_tail(&parent.children, &c3.list); - /* Test list_add_tail and !list_empty. */ - ok1(!list_empty(&parent.children)); + ccan_list_add_tail(&parent.children, &c3.list); + /* Test ccan_list_add_tail and !ccan_list_empty. */ + ok1(!ccan_list_empty(&parent.children)); ok1(parent.children.n.next == &c1.list); ok1(parent.children.n.prev == &c3.list); ok1(c1.list.next == &c2.list); @@ -74,23 +74,23 @@ 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(&parent.children, NULL)); + /* Test ccan_list_check */ + ok1(ccan_list_check(&parent.children, NULL)); - /* 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(&parent.children, struct child, list) == &c1); + /* Test ccan_list_top */ + ok1(ccan_list_top(&parent.children, struct child, list) == &c1); - /* Test list_tail */ - ok1(list_tail(&parent.children, struct child, list) == &c3); + /* Test ccan_list_tail */ + ok1(ccan_list_tail(&parent.children, struct child, list) == &c3); - /* 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); @@ -107,9 +107,9 @@ int main(int argc, char *argv[]) } ok1(i == 3); - /* Test list_for_each_rev. */ + /* Test ccan_list_for_each_rev. */ i = 0; - list_for_each_rev(&parent.children, c, list) { + ccan_list_for_each_rev(&parent.children, c, list) { switch (i++) { case 0: ok1(c == &c3); @@ -126,75 +126,75 @@ 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(&c->list); + ccan_list_del(&c->list); break; case 1: ok1(c == &c2); - list_del_from(&parent.children, &c->list); + ccan_list_del_from(&parent.children, &c->list); break; case 2: ok1(c == &c3); - list_del_from(&parent.children, &c->list); + ccan_list_del_from(&parent.children, &c->list); break; } - ok1(list_check(&parent.children, NULL)); + ok1(ccan_list_check(&parent.children, NULL)); if (i > 2) break; } ok1(i == 3); - ok1(list_empty(&parent.children)); + ok1(ccan_list_empty(&parent.children)); - /* Test list_for_each_off. */ - list_add_tail(&opaque_list, - (struct list_node *)create_opaque_blob()); - list_add_tail(&opaque_list, - (struct list_node *)create_opaque_blob()); - list_add_tail(&opaque_list, - (struct list_node *)create_opaque_blob()); + /* Test ccan_list_for_each_off. */ + ccan_list_add_tail(&opaque_list, + (struct ccan_list_node *)create_opaque_blob()); + ccan_list_add_tail(&opaque_list, + (struct ccan_list_node *)create_opaque_blob()); + ccan_list_add_tail(&opaque_list, + (struct ccan_list_node *)create_opaque_blob()); i = 0; - list_for_each_off(&opaque_list, q, 0) { + ccan_list_for_each_off(&opaque_list, q, 0) { i++; ok1(if_blobs_know_the_secret(q)); } ok1(i == 3); - /* Test list_for_each_safe_off, list_del_off and list_del_from_off. */ + /* Test ccan_list_for_each_safe_off, ccan_list_del_off and ccan_list_del_from_off. */ i = 0; - list_for_each_safe_off(&opaque_list, q, nq, 0) { + ccan_list_for_each_safe_off(&opaque_list, q, nq, 0) { switch (i++) { case 0: ok1(if_blobs_know_the_secret(q)); - list_del_off(q, 0); + ccan_list_del_off(q, 0); destroy_opaque_blob(q); break; case 1: ok1(if_blobs_know_the_secret(q)); - list_del_from_off(&opaque_list, q, 0); + ccan_list_del_from_off(&opaque_list, q, 0); destroy_opaque_blob(q); break; case 2: ok1(c == &c3); - list_del_from_off(&opaque_list, q, 0); + ccan_list_del_from_off(&opaque_list, q, 0); destroy_opaque_blob(q); break; } - ok1(list_check(&opaque_list, NULL)); + ok1(ccan_list_check(&opaque_list, NULL)); if (i > 2) break; } ok1(i == 3); - ok1(list_empty(&opaque_list)); + ok1(ccan_list_empty(&opaque_list)); - /* Test list_top/list_tail on empty list. */ - ok1(list_top(&parent.children, struct child, list) == NULL); - ok1(list_tail(&parent.children, struct child, list) == NULL); + /* Test ccan_list_top/ccan_list_tail on empty list. */ + ok1(ccan_list_top(&parent.children, struct child, list) == NULL); + ok1(ccan_list_tail(&parent.children, struct child, list) == NULL); return exit_status(); } -- cgit