Commit 2578442d authored by Rusty Russell's avatar Rusty Russell

strset: set errno on strset_add failures.

parent ed1b25bb
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <ccan/ilog/ilog.h> #include <ccan/ilog/ilog.h>
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h>
struct node { struct node {
/* To differentiate us from strings. */ /* To differentiate us from strings. */
...@@ -75,8 +76,10 @@ static bool set_string(struct strset *set, ...@@ -75,8 +76,10 @@ static bool set_string(struct strset *set,
/* Substitute magic empty node if this is the empty string */ /* Substitute magic empty node if this is the empty string */
if (unlikely(!member[0])) { if (unlikely(!member[0])) {
n->u.n = malloc(sizeof(*n->u.n)); n->u.n = malloc(sizeof(*n->u.n));
if (unlikely(!n->u.n)) if (unlikely(!n->u.n)) {
errno = ENOMEM;
return false; return false;
}
n->u.n->nul_byte = '\0'; n->u.n->nul_byte = '\0';
n->u.n->byte_num = (size_t)-1; n->u.n->byte_num = (size_t)-1;
/* Attach the string to child[0] */ /* Attach the string to child[0] */
...@@ -108,6 +111,7 @@ bool strset_set(struct strset *set, const char *member) ...@@ -108,6 +111,7 @@ bool strset_set(struct strset *set, const char *member)
for (byte_num = 0; str[byte_num] == member[byte_num]; byte_num++) { for (byte_num = 0; str[byte_num] == member[byte_num]; byte_num++) {
if (member[byte_num] == '\0') { if (member[byte_num] == '\0') {
/* All identical! */ /* All identical! */
errno = EEXIST;
return false; return false;
} }
} }
...@@ -122,7 +126,7 @@ bool strset_set(struct strset *set, const char *member) ...@@ -122,7 +126,7 @@ bool strset_set(struct strset *set, const char *member)
/* Allocate new node. */ /* Allocate new node. */
newn = malloc(sizeof(*newn)); newn = malloc(sizeof(*newn));
if (!newn) { if (!newn) {
/* FIXME */ errno = ENOMEM;
return false; return false;
} }
newn->nul_byte = '\0'; newn->nul_byte = '\0';
......
...@@ -65,8 +65,8 @@ char *strset_test(const struct strset *set, const char *member); ...@@ -65,8 +65,8 @@ char *strset_test(const struct strset *set, const char *member);
* @set: the set. * @set: the set.
* @member: the string to place in the set. * @member: the string to place in the set.
* *
* This returns false if we run out of memory, or (more normally) if that * This returns false if we run out of memory (errno = ENOMEM), or
* string already appears in the set. * (more normally) if that string already appears in the set (EEXIST).
* *
* Note that the pointer is placed in the set, the string is not copied. If * Note that the pointer is placed in the set, the string is not copied. If
* you want a copy in the set, use strdup(). * you want a copy in the set, use strdup().
......
...@@ -10,7 +10,7 @@ int main(void) ...@@ -10,7 +10,7 @@ int main(void)
char *dup = strdup(str); char *dup = strdup(str);
/* This is how many tests you plan to run */ /* This is how many tests you plan to run */
plan_tests(24); plan_tests(26);
strset_init(&set); strset_init(&set);
...@@ -25,6 +25,10 @@ int main(void) ...@@ -25,6 +25,10 @@ int main(void)
ok1(strset_test(&set, dup)); ok1(strset_test(&set, dup));
ok1(!strset_test(&set, none)); ok1(!strset_test(&set, none));
/* Add of duplicate should fail. */
ok1(!strset_set(&set, dup));
ok1(errno == EEXIST);
/* Delete should return original string. */ /* Delete should return original string. */
ok1(strset_clear(&set, dup) == str); ok1(strset_clear(&set, dup) == str);
ok1(!strset_test(&set, str)); ok1(!strset_test(&set, str));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment