X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fstrmap%2Ftest%2Frun-prefix.c;h=6232d71b26135106016d22a01f84feee45c988ca;hb=17a81baf84a9c8f89603173be3169a0a2017702d;hp=f6eb17796094a7c8aaf3e2e6d38857f06c07b4c9;hpb=20f3b260313fb4d5566aeb0d0c5439574e914e2d;p=ccan

diff --git a/ccan/strmap/test/run-prefix.c b/ccan/strmap/test/run-prefix.c
index f6eb1779..6232d71b 100644
--- a/ccan/strmap/test/run-prefix.c
+++ b/ccan/strmap/test/run-prefix.c
@@ -12,23 +12,21 @@ static bool in_order(const char *index, char *value, unsigned int *count)
 	ok1(i == atoi(value));
 	ok1(*count == i);
 	(*count)++;
-	return false;
+	return true;
 }
 
-static bool find_empty(const char *index, char *value, char *empty)
+static bool find_empty(const char *index, char *value UNNEEDED, char *empty)
 {
 	if (index == empty)
 		pass("Found empty entry!");
-	return false;
+	return true;
 }
 
 int main(void)
 {
-	struct map {
-		STRMAP_MEMBERS(char *);
-	};
-	struct map map;
-	const struct map *sub;
+	typedef STRMAP(char *) map_t;
+	map_t map;
+	const map_t *sub;
 	unsigned int i;
 	char *str[NUM], *empty;
 
@@ -56,9 +54,9 @@ int main(void)
 
 	/* Everything */
 	sub = strmap_prefix(&map, "0");
-	ok1(sub->raw.u.n == map.raw.u.n);
+	ok1(tcon_unwrap(sub)->u.n == tcon_unwrap(&map)->u.n);
 	sub = strmap_prefix(&map, "");
-	ok1(sub->raw.u.n == map.raw.u.n);
+	ok1(tcon_unwrap(sub)->u.n == tcon_unwrap(&map)->u.n);
 
 	/* Single. */
 	sub = strmap_prefix(&map, "00000000");