X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fstrset%2Fstrset.c;h=27d9d4568ad8559c7aa97eff9b9ed32cbee3106e;hp=a5441d4462e27da84ca1cf01ccfc897564c0bb98;hb=7c69053bd418bf0abd21f29e8cb11164684310ca;hpb=532cd74d55b89872211b34756d5ad59870dd012e

diff --git a/ccan/strset/strset.c b/ccan/strset/strset.c
index a5441d44..27d9d456 100644
--- a/ccan/strset/strset.c
+++ b/ccan/strset/strset.c
@@ -57,7 +57,7 @@ static const char *closest(struct strset n, const char *member)
 	return n.u.s;
 }
 
-char *strset_test(const struct strset *set, const char *member)
+char *strset_get(const struct strset *set, const char *member)
 {
 	const char *str;
 
@@ -90,7 +90,7 @@ static bool set_string(struct strset *set,
 	return true;
 }
 
-bool strset_set(struct strset *set, const char *member)
+bool strset_add(struct strset *set, const char *member)
 {
 	size_t len = strlen(member);
 	const u8 *bytes = (const u8 *)member;
@@ -163,7 +163,7 @@ bool strset_set(struct strset *set, const char *member)
 	return true;
 }
 
-char *strset_clear(struct strset *set, const char *member)
+char *strset_del(struct strset *set, const char *member)
 {
 	size_t len = strlen(member);
 	const u8 *bytes = (const u8 *)member;
@@ -229,19 +229,19 @@ char *strset_clear(struct strset *set, const char *member)
 }
 
 static bool iterate(struct strset n,
-		    bool (*handle)(const char *, void *), void *data)
+		    bool (*handle)(const char *, void *), const void *data)
 {
 	if (n.u.s[0])
-		return handle(n.u.s, data);
+		return handle(n.u.s, (void *)data);
 	if (unlikely(n.u.n->byte_num == (size_t)-1))
-		return handle(n.u.n->child[0].u.s, data);
+		return handle(n.u.n->child[0].u.s, (void *)data);
 
 	return iterate(n.u.n->child[0], handle, data)
 		|| iterate(n.u.n->child[1], handle, data);
 }
 
 void strset_iterate_(const struct strset *set,
-		     bool (*handle)(const char *, void *), void *data)
+		     bool (*handle)(const char *, void *), const void *data)
 {
 	/* Empty set? */
 	if (!set->u.n)
@@ -290,20 +290,20 @@ const struct strset *strset_prefix(const struct strset *set, const char *prefix)
 	return top;
 }
 
-static void destroy(struct strset n)
+static void clear(struct strset n)
 {
 	if (!n.u.s[0]) {
 		if (likely(n.u.n->byte_num != (size_t)-1)) {
-			destroy(n.u.n->child[0]);
-			destroy(n.u.n->child[1]);
+			clear(n.u.n->child[0]);
+			clear(n.u.n->child[1]);
 		}
 		free(n.u.n);
 	}
 }
 
-void strset_destroy(struct strset *set)
+void strset_clear(struct strset *set)
 {
 	if (set->u.n)
-		destroy(*set);
+		clear(*set);
 	set->u.n = NULL;
 }