X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fstr_talloc%2Ftest%2Frun.c;h=df85bb7259d1e5eef637ea2cb09b5c3614d06dc5;hp=2e45aafe2c2a51e30f115af39a0610f865417249;hb=377395cfa60d0773aab50c977f71b06596ebbc52;hpb=868412b72b7c83d1fec52d0f71355bc15de2600e

diff --git a/ccan/str_talloc/test/run.c b/ccan/str_talloc/test/run.c
index 2e45aafe..df85bb72 100644
--- a/ccan/str_talloc/test/run.c
+++ b/ccan/str_talloc/test/run.c
@@ -1,55 +1,47 @@
-#include "str_talloc/str_talloc.h"
+#include <ccan/str_talloc/str_talloc.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "str_talloc/str_talloc.c"
-#include "tap/tap.h"
-#include "str/str.h"
+#include <ccan/str_talloc/str_talloc.c>
+#include <ccan/tap/tap.h>
 
-/* FIXME: ccanize */
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
 
-static char *substrings[] = { "far", "bar", "baz", "b", "ba", "z", "ar", NULL };
+static const 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, "));
+	str = strjoin(NULL, (char **)substrings, ", ");
+	ok1(!strcmp(str, "far, bar, baz, b, ba, z, ar, "));
 	ctx = str;
-	str = strjoin(ctx, substrings, "");
-	ok1(streq(str, "farbarbazbbazar"));
+	str = strjoin(ctx, (char **)substrings, "");
+	ok1(!strcmp(str, "farbarbazbbazar"));
 	ok1(talloc_parent(str) == ctx);
 	talloc_free(ctx);