setset: fix API to match strmap and common sense.

[ccan] / ccan / strset / test / run-order.c

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++)
        }
 
        for (i = 0; i < NUM; i++)

-               strset_set(&set, str[i]);
+               strset_add(&set, str[i]);

 
        strset_iterate(&set, dump, NULL);
 
 
        strset_iterate(&set, dump, NULL);
 


@@ -53,25 +53,25 @@ int main(void)
 
        /* Preserve order after deletion. */
        for (i = 0; i < NUM; i += 2)
 
        /* 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)
 
        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++)
 
        /* 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);
 
 
        i = 0;
        strset_iterate(&set, in_order, &i);
 

-       strset_destroy(&set);
+       strset_clear(&set);

 
        for (i = 0; i < NUM; i++)
                free(str[i]);
 
        for (i = 0; i < NUM; i++)
                free(str[i]);