failtest: fix failpath on open.

[ccan] / ccan / strmap / strmap.c

diff --git a/ccan/strmap/strmap.c b/ccan/strmap/strmap.c
index 7d03cca43ad7ff709bdcd9699ac31b5ad74fe309..872ca544c6aab1fa3b9d813534b74486cf77ec70 100644 (file)
--- a/ccan/strmap/strmap.c
+++ b/ccan/strmap/strmap.c
@@ -5,6 +5,7 @@
 #include <ccan/ilog/ilog.h>
 #include <assert.h>
 #include <stdlib.h>
+#include <errno.h>
 
 struct node {
        /* These point to strings or nodes. */
@@ -38,12 +39,13 @@ void *strmap_get_(const struct strmap *map, const char *member)
 {
        struct strmap *n;
 
-       /* Empty map? */
-       if (!map->u.n)
-               return NULL;
-       n = closest((struct strmap *)map, member);
-       if (streq(member, n->u.s))
-               return n->v;
+       /* Not empty map? */
+       if (map->u.n) {
+               n = closest((struct strmap *)map, member);
+               if (streq(member, n->u.s))
+                       return n->v;
+       }
+       errno = ENOENT;
        return NULL;
 }
 
@@ -72,6 +74,7 @@ bool strmap_add_(struct strmap *map, const char *member, const void *value)
        for (byte_num = 0; n->u.s[byte_num] == member[byte_num]; byte_num++) {
                if (member[byte_num] == '\0') {
                        /* All identical! */
+                       errno = EEXIST;
                        return false;
                }
        }
@@ -86,7 +89,7 @@ bool strmap_add_(struct strmap *map, const char *member, const void *value)
        /* Allocate new node. */
        newn = malloc(sizeof(*newn));
        if (!newn) {
-               /* FIXME */
+               errno = ENOMEM;
                return false;
        }
        newn->byte_num = byte_num;
@@ -127,8 +130,10 @@ char *strmap_del_(struct strmap *map, const char *member, void **valuep)
        u8 direction = 0; /* prevent bogus gcc warning. */
 
        /* Empty map? */
-       if (!map->u.n)
+       if (!map->u.n) {
+               errno = ENOENT;
                return NULL;
+       }
 
        /* Find closest, but keep track of parent. */
        n = map;
@@ -146,8 +151,10 @@ char *strmap_del_(struct strmap *map, const char *member, void **valuep)
        }
 
        /* Did we find it? */
-       if (!streq(member, n->u.s))
+       if (!streq(member, n->u.s)) {
+               errno = ENOENT;
                return NULL;
+       }
 
        ret = n->u.s;
        if (valuep)