- /* 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;
for (byte_num = 0; n->u.s[byte_num] == member[byte_num]; byte_num++) {
if (member[byte_num] == '\0') {
/* All identical! */
for (byte_num = 0; n->u.s[byte_num] == member[byte_num]; byte_num++) {
if (member[byte_num] == '\0') {
/* All identical! */
- bool (*handle)(const char *, void *, void *), void *data)
+ bool (*handle)(const char *, void *, void *),
+ const void *data)
- bool (*handle)(const char *, void *, void *), void *data)
+ bool (*handle)(const char *, void *, void *),
+ const void *data)