]> git.ozlabs.org Git - ccan/blobdiff - ccan/tal/str/test/run-take.c
ccan: Correct some poor conventions in _info includes
[ccan] / ccan / tal / str / test / run-take.c
index 0cbab9e00eb41db6586876cb6088ce83dd0ded71..edf173f81462e346f4c759c5b7ce732de6295a42 100644 (file)
@@ -1,6 +1,7 @@
 #include <ccan/tal/str/str.h>
 #include <ccan/tal/str/str.c>
 #include <ccan/tap/tap.h>
+#include "helper.h"
 
 int main(void)
 {
@@ -27,12 +28,12 @@ int main(void)
        tal_free(c);
 
        c = tal_strdup(parent, "hello %s");
-       c = tal_asprintf(parent, take(c), "there");
+       c = tal_fmt(parent, take(c), "there");
        ok1(strcmp(c, "hello there") == 0);
        ok1(tal_parent(c) == parent);
        /* No leftover allocations. */
        tal_free(c);
-       ok1(tal_first(parent) == NULL);
+       ok1(no_children(parent));
 
        tal_free(parent);
        ok1(!taken_any());
@@ -41,7 +42,7 @@ int main(void)
        c = NULL;
        ok1(tal_strdup(NULL, take(c)) == NULL);
        ok1(tal_strndup(NULL, take(c), 5) == NULL);
-       ok1(tal_asprintf(NULL, take(c), 0) == NULL);
+       ok1(tal_fmt(NULL, take(c), 0) == NULL);
 
        return exit_status();
 }