From: Junio C Hamano Date: Tue, 15 Dec 2020 21:25:36 +0000 (-0800) Subject: strmap: make callers of strmap_remove() to call it in void context X-Git-Tag: v2.30.0-rc1~5^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=37e73233c34ceac9f16bd8e7c33ae4c8a4157b1c;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/strmap.h b/strmap.h index c4c104411b..1e152d832d 100644 --- a/strmap.h +++ b/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)