Skip to content

Commit 37e7323

Browse files
committed
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 449a900 commit 37e7323

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

strmap.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ static inline int strintmap_contains(struct strintmap *map, const char *str)
165165

166166
static inline void strintmap_remove(struct strintmap *map, const char *str)
167167
{
168-
return strmap_remove(&map->map, str, 0);
168+
strmap_remove(&map->map, str, 0);
169169
}
170170

171171
static inline int strintmap_empty(struct strintmap *map)
@@ -249,7 +249,7 @@ static inline int strset_contains(struct strset *set, const char *str)
249249

250250
static inline void strset_remove(struct strset *set, const char *str)
251251
{
252-
return strmap_remove(&set->map, str, 0);
252+
strmap_remove(&set->map, str, 0);
253253
}
254254

255255
static inline int strset_empty(struct strset *set)

0 commit comments

Comments
 (0)