Browse Source

strmap: make callers of strmap_remove() to call it in void context

Two "static inline" functions, both of which return void, call
strmap_remove() and tries to return the value it returns as their
return value, which is just bogus, as strmap_remove() returns void
itself.  Call it in the void context and fall-thru the control to
the end instead.

Reported-by: Randall S. Becker <rsbecker@nexbridge.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
pull/933/head
Junio C Hamano 2 years ago
parent
commit
37e73233c3
  1. 4
      strmap.h

4
strmap.h

@ -165,7 +165,7 @@ static inline int strintmap_contains(struct strintmap *map, const char *str)
static inline void strintmap_remove(struct strintmap *map, const char *str)
{
return strmap_remove(&map->map, str, 0);
strmap_remove(&map->map, str, 0);
}
static inline int strintmap_empty(struct strintmap *map)
@ -249,7 +249,7 @@ static inline int strset_contains(struct strset *set, const char *str)
static inline void strset_remove(struct strset *set, const char *str)
{
return strmap_remove(&set->map, str, 0);
strmap_remove(&set->map, str, 0);
}
static inline int strset_empty(struct strset *set)

Loading…
Cancel
Save