X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftal%2Ftest%2Frun-take.c;h=d93304e206bdf4207cb33bc7bd5eaf12333eb982;hb=a8722345053b7cd860499aa31fd6bb414c120cc8;hp=a6e667bbae0875104725d36f676a95083d31d388;hpb=e03d7ecb505cb73ff244708323b0f1a5a0c5cd7a;p=ccan

diff --git a/ccan/tal/test/run-take.c b/ccan/tal/test/run-take.c
index a6e667bb..d93304e2 100644
--- a/ccan/tal/test/run-take.c
+++ b/ccan/tal/test/run-take.c
@@ -6,45 +6,37 @@ int main(void)
 {
 	char *parent, *c;
 
-	plan_tests(24);
+	plan_tests(21);
 
 	/* 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(parent, take(c));
-	ok1(strcmp(c, "hello") == 0);
-	ok1(tal_parent(c) == parent);
-
-	c = tal_strndup(parent, take(c), 5);
-	ok1(strcmp(c, "hello") == 0);
-	ok1(tal_parent(c) == parent);
-
-	c = tal_strndup(parent, take(c), 3);
-	ok1(strcmp(c, "hel") == 0);
-	ok1(tal_parent(c) == parent);
-
-	c = tal_dup(parent, char, take(c), 1, 0);
+	c = tal(parent, char);
+	*c = 'h';
+	c = tal_dup(parent, char, take(c));
 	ok1(c[0] == 'h');
 	ok1(tal_parent(c) == parent);
 
-	c = tal_dup(parent, char, take(c), 1, 2);
+	c = tal_dup_arr(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);
+	c = tal_dup(NULL, char, take(c));
 	ok1(c[0] == 'h');
 	ok1(tal_parent(c) == NULL);
 
@@ -52,16 +44,14 @@ int main(void)
 	tal_free(c);
 	ok1(tal_first(parent) == NULL);
 
-	c = tal_strdup(parent, "hello %s");
-	c = tal_asprintf(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);
-
 	tal_free(parent);
 	ok1(!taken_any());
 
+	/* NULL pass-through. */
+	c = NULL;
+	ok1(tal_dup_arr(NULL, char, take(c), 5, 5) == NULL);
+	ok1(!taken_any());
+
+	tal_cleanup();
 	return exit_status();
 }