strsplit: remove nump argument

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

diff --git a/ccan/str_talloc/test/run.c b/ccan/str_talloc/test/run.c
index 4e1c3d168dcdd475994fb83b251a54c1b9662562..6b7fe14ed1d71fd7fabe8e41cae8cc488a1b90aa 100644 (file)
--- a/ccan/str_talloc/test/run.c
+++ b/ccan/str_talloc/test/run.c
@@ -3,53 +3,44 @@
 #include <stdio.h>
 #include <ccan/str_talloc/str_talloc.c>
 #include <ccan/tap/tap.h>
-#include <ccan/str/str.h>
 
-/* FIXME: ccanize */
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
 
 static char *substrings[] = { "far", "bar", "baz", "b", "ba", "z", "ar", NULL };
 
 int main(int argc, char *argv[])
 {
-       unsigned int n;
        char **split, *str;
        void *ctx;
 
-       plan_tests(19);
-       split = strsplit(NULL, "hello  world", " ", &n);
-       ok1(n == 3);
-       ok1(streq(split[0], "hello"));
-       ok1(streq(split[1], ""));
-       ok1(streq(split[2], "world"));
+       plan_tests(16);
+       split = strsplit(NULL, "hello  world", " ");
+       ok1(talloc_array_length(split) == 4);
+       ok1(!strcmp(split[0], "hello"));
+       ok1(!strcmp(split[1], ""));
+       ok1(!strcmp(split[2], "world"));
        ok1(split[3] == NULL);
        talloc_free(split);
 
-       split = strsplit(NULL, "hello  world", " ", NULL);
-       ok1(streq(split[0], "hello"));
-       ok1(streq(split[1], ""));
-       ok1(streq(split[2], "world"));
-       ok1(split[3] == NULL);
-       talloc_free(split);
-
-       split = strsplit(NULL, "hello  world", "o ", NULL);
-       ok1(streq(split[0], "hell"));
-       ok1(streq(split[1], ""));
-       ok1(streq(split[2], ""));
-       ok1(streq(split[3], "w"));
-       ok1(streq(split[4], "rld"));
+       split = strsplit(NULL, "hello  world", "o ");
+       ok1(talloc_array_length(split) == 6);
+       ok1(!strcmp(split[0], "hell"));
+       ok1(!strcmp(split[1], ""));
+       ok1(!strcmp(split[2], ""));
+       ok1(!strcmp(split[3], "w"));
+       ok1(!strcmp(split[4], "rld"));
        ok1(split[5] == NULL);
 
        ctx = split;
-       split = strsplit(ctx, "hello  world", "o ", NULL);
+       split = strsplit(ctx, "hello  world", "o ");
        ok1(talloc_parent(split) == ctx);
        talloc_free(ctx);
 
        str = strjoin(NULL, substrings, ", ");
-       ok1(streq(str, "far, bar, baz, b, ba, z, ar, "));
+       ok1(!strcmp(str, "far, bar, baz, b, ba, z, ar, "));
        ctx = str;
        str = strjoin(ctx, substrings, "");
-       ok1(streq(str, "farbarbazbbazar"));
+       ok1(!strcmp(str, "farbarbazbbazar"));
        ok1(talloc_parent(str) == ctx);
        talloc_free(ctx);