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>
Junio C Hamano committed
Dec 15, 2020 at 13:25 UTC
37e73233c34ceac9f16bd8e7c33ae4c8a4157b1c
1 file changed
+2
-2
strmap.h
+2
-2
@@ -165,7 +165,7 @@ static inline int strintmap_contains(struct strintmap *map, const char *str)
165
166
static inline void strintmap_remove(struct strintmap *map, const char *str)
167
{
168
- return strmap_remove(&map->map, str, 0);
168
+ strmap_remove(&map->map, str, 0);
169
}
170
171
static inline int strintmap_empty(struct strintmap *map)
@@ -249,7 +249,7 @@ static inline int strset_contains(struct strset *set, const char *str)
249
250
static inline void strset_remove(struct strset *set, const char *str)
251
{
252
- return strmap_remove(&set->map, str, 0);
252
+ strmap_remove(&set->map, str, 0);
253
}
254
255
static inline int strset_empty(struct strset *set)