X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fstrmap%2Fstrmap.c;h=16a30e036ad44c3492a9e05074747b7b15a6bff6;hp=9fa51d0d40db4cf89fb16041585d71ea163b2238;hb=d99e02dc8ae052b044ac255b1ec9ac76655a73c7;hpb=b737dbc2ba48b51f68437d0a8b7f7a4816da110a

diff --git a/ccan/strmap/strmap.c b/ccan/strmap/strmap.c
index 9fa51d0d..16a30e03 100644
--- a/ccan/strmap/strmap.c
+++ b/ccan/strmap/strmap.c
@@ -17,9 +17,8 @@ struct node {
 };
 
 /* Closest member to this in a non-empty map. */
-static struct strmap *closest(struct strmap *n, const char *member)
+static struct strmap *closest(struct strmap *n, const char *member, size_t len)
 {
-	size_t len = strlen(member);
 	const u8 *bytes = (const u8 *)member;
 
 	/* Anything with NULL value is a node. */
@@ -35,20 +34,26 @@ static struct strmap *closest(struct strmap *n, const char *member)
 	return n;
 }
 
-void *strmap_get_(const struct strmap *map, const char *member)
+void *strmap_getn_(const struct strmap *map,
+		   const char *member, size_t memberlen)
 {
 	struct strmap *n;
 
 	/* Not empty map? */
 	if (map->u.n) {
-		n = closest((struct strmap *)map, member);
-		if (streq(member, n->u.s))
+		n = closest((struct strmap *)map, member, memberlen);
+		if (!strncmp(member, n->u.s, memberlen) && !n->u.s[memberlen])
 			return n->v;
 	}
 	errno = ENOENT;
 	return NULL;
 }
 
+void *strmap_get_(const struct strmap *map, const char *member)
+{
+	return strmap_getn_(map, member, strlen(member));
+}
+
 bool strmap_add_(struct strmap *map, const char *member, const void *value)
 {
 	size_t len = strlen(member);
@@ -68,7 +73,7 @@ bool strmap_add_(struct strmap *map, const char *member, const void *value)
 	}
 
 	/* Find closest existing member. */
-	n = closest(map, member);
+	n = closest(map, member, len);
 
 	/* Find where they differ. */
 	for (byte_num = 0; n->u.s[byte_num] == member[byte_num]; byte_num++) {