tal: take implies NULL passthrough.

[ccan] / ccan / tal / test / run-take.c

diff --git a/ccan/tal/test/run-take.c b/ccan/tal/test/run-take.c
index 53c1a44a85390e419075268efb157617390be71d..9f0a22c6c4ea24bf6cae5b0701564573b7bdb347 100644 (file)
--- a/ccan/tal/test/run-take.c
+++ b/ccan/tal/test/run-take.c
@@ -6,40 +6,58 @@ int main(void)
 {
        char *parent, *c;
 
-       plan_tests(15);
+       plan_tests(32);
+
+       /* We can take NULL. */
+       ok1(take(NULL) == NULL);
+       ok1(is_taken(NULL));
+       ok1(taken(NULL)); /* Undoes take() */
+       ok1(!is_taken(NULL));
+       ok1(!taken(NULL));
 
        parent = tal(NULL, char);
        ok1(parent);
 
+       ok1(take(parent) == parent);
+       ok1(is_taken(parent));
+       ok1(taken(parent)); /* Undoes take() */
+       ok1(!is_taken(parent));
+       ok1(!taken(parent));
+
        c = tal_strdup(parent, "hello");
 
-       c = tal_strdup(TAL_TAKE, c);
+       c = tal_strdup(parent, take(c));
        ok1(strcmp(c, "hello") == 0);
        ok1(tal_parent(c) == parent);
 
-       c = tal_strndup(TAL_TAKE, c, 5);
+       c = tal_strndup(parent, take(c), 5);
        ok1(strcmp(c, "hello") == 0);
        ok1(tal_parent(c) == parent);
 
-       c = tal_strndup(TAL_TAKE, c, 3);
+       c = tal_strndup(parent, take(c), 3);
        ok1(strcmp(c, "hel") == 0);
        ok1(tal_parent(c) == parent);
 
-       c = tal_dup(TAL_TAKE, char, c, 1, 0);
+       c = tal_dup(parent, char, take(c), 1, 0);
        ok1(c[0] == 'h');
        ok1(tal_parent(c) == parent);
 
-       c = tal_dup(TAL_TAKE, char, c, 1, 2);
+       c = tal_dup(parent, char, take(c), 1, 2);
        ok1(c[0] == 'h');
        strcpy(c, "hi");
        ok1(tal_parent(c) == parent);
 
+       /* dup must reparent child. */
+       c = tal_dup(NULL, char, take(c), 1, 0);
+       ok1(c[0] == 'h');
+       ok1(tal_parent(c) == NULL);
+
        /* No leftover allocations. */
        tal_free(c);
        ok1(tal_first(parent) == NULL);
 
        c = tal_strdup(parent, "hello %s");
-       c = tal_asprintf(TAL_TAKE, c, "there");
+       c = tal_asprintf(parent, take(c), "there");
        ok1(strcmp(c, "hello there") == 0);
        ok1(tal_parent(c) == parent);
        /* No leftover allocations. */
@@ -47,6 +65,14 @@ int main(void)
        ok1(tal_first(parent) == NULL);
 
        tal_free(parent);
+       ok1(!taken_any());
+
+       /* NULL pass-through. */
+       c = NULL;
+       ok1(tal_strdup(NULL, take(c)) == NULL);
+       ok1(tal_strndup(NULL, take(c), 5) == NULL);
+       ok1(tal_dup(NULL, char, take(c), 5, 5) == NULL);
+       ok1(tal_asprintf(NULL, take(c), 0) == NULL);
 
        return exit_status();
 }