tal: make tal_next() only return immediate children.

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

diff --git a/ccan/tal/test/run.c b/ccan/tal/test/run.c
index 69ffa2d3dc3248de0cf7ceeeaa43963c0aa9c8e4..4931099e79049e3fa74ce316444f08a325633b3f 100644 (file)
--- a/ccan/tal/test/run.c
+++ b/ccan/tal/test/run.c
@@ -7,10 +7,15 @@ int main(void)
        char *parent, *c[4], *p;
        int i, j;
 
        char *parent, *c[4], *p;
        int i, j;
 

-       plan_tests(10);
+       plan_tests(14);
+
+       /* tal_free(NULL) works. */
+       ok1(tal_free(NULL) == NULL);

 
        parent = tal(NULL, char);
        ok1(parent);
 
        parent = tal(NULL, char);
        ok1(parent);

+       ok1(tal_parent(parent) == NULL);
+       ok1(tal_parent(NULL) == NULL);

 
        for (i = 0; i < 4; i++)
                c[i] = tal(parent, char);
 
        for (i = 0; i < 4; i++)
                c[i] = tal(parent, char);


@@ -20,7 +25,7 @@ int main(void)
 
        /* Iteration test. */
        i = 0;
 
        /* Iteration test. */
        i = 0;

-       for (p = tal_first(parent); p; p = tal_next(parent, p)) {
+       for (p = tal_first(parent); p; p = tal_next(p)) {

                *p = '1';
                i++;
        }
                *p = '1';
                i++;
        }


@@ -31,7 +36,7 @@ int main(void)
        ok1(*c[3] == '1');
 
        /* Free parent. */
        ok1(*c[3] == '1');
 
        /* Free parent. */

-       tal_free(parent);
+       ok1(tal_free(parent) == NULL);

 
        parent = tal(NULL, char);
 
 
        parent = tal(NULL, char);
 


@@ -51,5 +56,6 @@ int main(void)
        }
        tal_free(parent);
 
        }
        tal_free(parent);
 

+       tal_cleanup();

        return exit_status();
 }
        return exit_status();
 }