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

diff --git a/ccan/strset/strset.c b/ccan/strset/strset.c
index 7c64b0cd..a5441d44 100644
--- a/ccan/strset/strset.c
+++ b/ccan/strset/strset.c
@@ -61,12 +61,13 @@ char *strset_test(const struct strset *set, const char *member)
 {
 	const char *str;
 
-	/* Empty set? */
-	if (!set->u.n)
-		return NULL;
-	str = closest(*set, member);
-	if (streq(member, str))
-		return (char *)str;
+	/* Non-empty set? */
+	if (set->u.n) {
+		str = closest(*set, member);
+		if (streq(member, str))
+			return (char *)str;
+	}
+	errno = ENOENT;
 	return NULL;
 }
 
@@ -171,8 +172,10 @@ char *strset_clear(struct strset *set, const char *member)
 	u8 direction = 0; /* prevent bogus gcc warning. */
 
 	/* Empty set? */
-	if (!set->u.n)
+	if (!set->u.n) {
+		errno = ENOENT;
 		return NULL;
+	}
 
 	/* Find closest, but keep track of parent. */
 	n = set;
@@ -184,8 +187,10 @@ char *strset_clear(struct strset *set, const char *member)
 		if (unlikely(n->u.n->byte_num == (size_t)-1)) {
 			const char *empty_str = n->u.n->child[0].u.s;
 
-			if (member[0])
+			if (member[0]) {
+				errno = ENOENT;
 				return NULL;
+			}
 
 			/* Sew empty string back so remaining logic works */
 			free(n->u.n);
@@ -203,8 +208,10 @@ char *strset_clear(struct strset *set, const char *member)
 	}
 
 	/* Did we find it? */
-	if (!streq(member, n->u.s))
+	if (!streq(member, n->u.s)) {
+		errno = ENOENT;
 		return NULL;
+	}
 
 	ret = n->u.s;