setset: fix API to match strmap and common sense.

strset_set -> strset_add
strset_clear -> strset_del
strset_test -> strset_get
strset_destroy -> strset_clear

diff --git a/ccan/strset/_info b/ccan/strset/_info
index 81e8f53cca08b73a3c1322d2da1cb6b7d4064c9a..a3192325db721c67e374c354375317216709c577 100644 (file)
--- a/ccan/strset/_info
+++ b/ccan/strset/_info
@@ -38,7 +38,7 @@
  *             for (word = strtok(file, " \t\r\n");
  *                  word;
  *                  word = strtok(NULL, " \t\r\n")) {
- *                     strset_set(&words, word);
+ *                     strset_add(&words, word);
  *             }
  *             strset_iterate(&words, dump, NULL);
  *             printf("\n");

diff --git a/ccan/strset/strset.c b/ccan/strset/strset.c
index 8b38ba2978f617dc4d018c045ab4c8b236bedb87..27d9d4568ad8559c7aa97eff9b9ed32cbee3106e 100644 (file)
--- 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;
@@ -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;
 }

diff --git a/ccan/strset/strset.h b/ccan/strset/strset.h
index 9352fe9fb2e2918aa2af8715a64b376765b61cb6..05e1e358a8ee2f56fb82a7b1124fc15a783c7013 100644 (file)
--- a/ccan/strset/strset.h
+++ b/ccan/strset/strset.h
@@ -48,7 +48,7 @@ static inline bool strset_empty(const struct strset *set)
 }
 
 /**
- * strset_test - is this a member of this string set?
+ * strset_get - is this a member of this string set?
  * @set: the set.
  * @member: the string to search for.
  *
@@ -56,13 +56,13 @@ static inline bool strset_empty(const struct strset *set)
  * = ENOENT).
  *
  * Example:
- *     if (strset_test(&set, "hello"))
+ *     if (strset_get(&set, "hello"))
  *             printf("hello is in the set\n");
  */
-char *strset_test(const struct strset *set, const char *member);
+char *strset_get(const struct strset *set, const char *member);
 
 /**
- * strset_set - place a member in the string set.
+ * strset_add - place a member in the string set.
  * @set: the set.
  * @member: the string to place in the set.
  *
@@ -73,38 +73,38 @@ char *strset_test(const struct strset *set, const char *member);
  * you want a copy in the set, use strdup().
  *
  * Example:
- *     if (!strset_set(&set, "goodbye"))
+ *     if (!strset_add(&set, "goodbye"))
  *             printf("goodbye was already in the set\n");
  */
-bool strset_set(struct strset *set, const char *member);
+bool strset_add(struct strset *set, const char *member);
 
 /**
- * strset_clear - remove a member from the string set.
+ * strset_del - remove a member from the string set.
  * @set: the set.
  * @member: the string to remove from the set.
  *
- * This returns the string which was passed to strset_set(), or NULL if
+ * This returns the string which was passed to strset_add(), or NULL if
  * the string was not in the map (in which case it sets errno = ENOENT).
  *
  * This means that if you allocated a string (eg. using strdup()), you can
  * free it here.
  *
  * Example:
- *     if (!strset_clear(&set, "goodbye"))
+ *     if (!strset_del(&set, "goodbye"))
  *             printf("goodbye was not in the set?\n");
  */
-char *strset_clear(struct strset *set, const char *member);
+char *strset_del(struct strset *set, const char *member);
 
 /**
- * strset_destroy - remove every member from the set.
+ * strset_clear - remove every member from the set.
  * @set: the set.
  *
  * The set will be empty after this.
  *
  * Example:
- *     strset_destroy(&set);
+ *     strset_clear(&set);
  */
-void strset_destroy(struct strset *set);
+void strset_clear(struct strset *set);
 
 /**
  * strset_iterate - ordered iteration over a set

diff --git a/ccan/strset/test/run-hibit.c b/ccan/strset/test/run-hibit.c
index 2ea158dd9ad6ad77cb4d17866201b18f4d455e48..833095616b9b99e6bf360cd86ad43d88f2051857 100644 (file)
--- a/ccan/strset/test/run-hibit.c
+++ b/ccan/strset/test/run-hibit.c
@@ -53,7 +53,7 @@ int main(void)
        }
 
        for (i = 0; i < NUM; i++)
-               strset_set(&set, str[i]);
+               strset_add(&set, str[i]);
 
        strset_iterate(&set, dump, NULL);
 
@@ -63,13 +63,13 @@ int main(void)
 
        /* Preserve order after deletion. */
        for (i = 0; i < NUM; i += 2)
-               ok1(strset_clear(&set, str[i]) == str[i]);
+               ok1(strset_del(&set, str[i]) == str[i]);
 
        i = 1;
        strset_iterate(&set, in_order_by_2, &i);
 
        for (i = 1; i < NUM; i += 2)
-               ok1(strset_clear(&set, str[i]) == str[i]);
+               ok1(strset_del(&set, str[i]) == str[i]);
 
        /* empty traverse. */
        strset_iterate(&set, in_order_by_2, (unsigned int *)NULL);

diff --git a/ccan/strset/test/run-iterate-const.c b/ccan/strset/test/run-iterate-const.c
index 42a1d73552b9541d19297770ad65bf9706e7b650..daa27504ef25b207643bf51b1023755b245c68c8 100644 (file)
--- a/ccan/strset/test/run-iterate-const.c
+++ b/ccan/strset/test/run-iterate-const.c
@@ -19,11 +19,11 @@ int main(void)
        plan_tests(3);
 
        strset_init(&set);
-       ok1(strset_set(&set, "hello"));
-       ok1(strset_set(&set, "world"));
+       ok1(strset_add(&set, "hello"));
+       ok1(strset_add(&set, "world"));
        strset_iterate(&set, find_string, (const char *)"hello");
        ok1(found);
-       strset_destroy(&set);
+       strset_clear(&set);
 
        /* This exits depending on whether all tests passed */
        return exit_status();

diff --git a/ccan/strset/test/run-order.c b/ccan/strset/test/run-order.c
index 73784e75c88575df194de741a3c21d0ee19956f4..bc3b2984b5f894dab44c70ab81398a01f689c54e 100644 (file)
--- a/ccan/strset/test/run-order.c
+++ b/ccan/strset/test/run-order.c
@@ -43,7 +43,7 @@ int main(void)
        }
 
        for (i = 0; i < NUM; i++)
-               strset_set(&set, str[i]);
+               strset_add(&set, str[i]);
 
        strset_iterate(&set, dump, NULL);
 
@@ -53,25 +53,25 @@ int main(void)
 
        /* Preserve order after deletion. */
        for (i = 0; i < NUM; i += 2)
-               ok1(strset_clear(&set, str[i]) == str[i]);
+               ok1(strset_del(&set, str[i]) == str[i]);
 
        i = 1;
        strset_iterate(&set, in_order_by_2, &i);
 
        for (i = 1; i < NUM; i += 2)
-               ok1(strset_clear(&set, str[i]) == str[i]);
+               ok1(strset_del(&set, str[i]) == str[i]);
 
        /* empty traverse. */
        strset_iterate(&set, in_order_by_2, (unsigned int *)NULL);
 
        /* insert backwards, should be fine. */
        for (i = 0; i < NUM; i++)
-               strset_set(&set, str[NUM-1-i]);
+               strset_add(&set, str[NUM-1-i]);
 
        i = 0;
        strset_iterate(&set, in_order, &i);
 
-       strset_destroy(&set);
+       strset_clear(&set);
 
        for (i = 0; i < NUM; i++)
                free(str[i]);

diff --git a/ccan/strset/test/run-prefix.c b/ccan/strset/test/run-prefix.c
index 87ce98fa5b7a31a1104587c2dae4b2455669bac5..1be6283374bbcda462cdd99a12c29d6df16ce556 100644 (file)
--- a/ccan/strset/test/run-prefix.c
+++ b/ccan/strset/test/run-prefix.c
@@ -38,7 +38,7 @@ int main(void)
        }
 
        for (i = 0; i < NUM; i++)
-               strset_set(&set, str[i]);
+               strset_add(&set, str[i]);
 
        /* Nothing */
        sub = strset_prefix(&set, "a");
@@ -70,13 +70,13 @@ int main(void)
 
        /* Everything, *plus* empty string. */
        empty = strdup("");
-       strset_set(&set, empty);
+       strset_add(&set, empty);
 
        sub = strset_prefix(&set, "");
        /* Check we get *our* empty string back! */
        strset_iterate(sub, find_empty, empty);
 
-       strset_destroy(&set);
+       strset_clear(&set);
 
        for (i = 0; i < NUM; i++)
                free(str[i]);

diff --git a/ccan/strset/test/run.c b/ccan/strset/test/run.c
index 412a1fdfb1b1532ccb41e03569bee8feff5c0cc7..a84172d9e1f942e11f2ac289aeb0e4d7b86fb3fd 100644 (file)
--- a/ccan/strset/test/run.c
+++ b/ccan/strset/test/run.c
@@ -14,53 +14,53 @@ int main(void)
 
        strset_init(&set);
 
-       ok1(!strset_test(&set, str));
+       ok1(!strset_get(&set, str));
        ok1(errno == ENOENT);
-       ok1(!strset_test(&set, none));
+       ok1(!strset_get(&set, none));
        ok1(errno == ENOENT);
-       ok1(!strset_clear(&set, str));
+       ok1(!strset_del(&set, str));
        ok1(errno == ENOENT);
-       ok1(!strset_clear(&set, none));
+       ok1(!strset_del(&set, none));
        ok1(errno == ENOENT);
 
-       ok1(strset_set(&set, str));
-       ok1(strset_test(&set, str));
+       ok1(strset_add(&set, str));
+       ok1(strset_get(&set, str));
        /* We compare the string, not the pointer. */
-       ok1(strset_test(&set, dup));
-       ok1(!strset_test(&set, none));
+       ok1(strset_get(&set, dup));
+       ok1(!strset_get(&set, none));
        ok1(errno == ENOENT);
 
        /* Add of duplicate should fail. */
-       ok1(!strset_set(&set, dup));
+       ok1(!strset_add(&set, dup));
        ok1(errno == EEXIST);
 
        /* Delete should return original string. */
-       ok1(strset_clear(&set, dup) == str);
-       ok1(!strset_test(&set, str));
+       ok1(strset_del(&set, dup) == str);
+       ok1(!strset_get(&set, str));
        ok1(errno == ENOENT);
-       ok1(!strset_test(&set, none));
+       ok1(!strset_get(&set, none));
        ok1(errno == ENOENT);
 
        /* Try insert and delete of empty string. */
-       ok1(strset_set(&set, none));
-       ok1(strset_test(&set, none));
-       ok1(!strset_test(&set, str));
+       ok1(strset_add(&set, none));
+       ok1(strset_get(&set, none));
+       ok1(!strset_get(&set, str));
        ok1(errno == ENOENT);
 
        /* Delete should return original string. */
-       ok1(strset_clear(&set, "") == none);
-       ok1(!strset_test(&set, str));
+       ok1(strset_del(&set, "") == none);
+       ok1(!strset_get(&set, str));
        ok1(errno == ENOENT);
-       ok1(!strset_test(&set, none));
+       ok1(!strset_get(&set, none));
        ok1(errno == ENOENT);
 
        /* Both at once... */
-       ok1(strset_set(&set, none));
-       ok1(strset_set(&set, str));
-       ok1(strset_test(&set, str));
-       ok1(strset_test(&set, none));
-       ok1(strset_clear(&set, "") == none);
-       ok1(strset_clear(&set, dup) == str);
+       ok1(strset_add(&set, none));
+       ok1(strset_add(&set, str));
+       ok1(strset_get(&set, str));
+       ok1(strset_get(&set, none));
+       ok1(strset_del(&set, "") == none);
+       ok1(strset_del(&set, dup) == str);
 
        ok1(set.u.n == NULL);
        free(dup);