| Message ID | xmqqtusm7odr.fsf_-_@gitster.c.googlers.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 37e73233c34ceac9f16bd8e7c33ae4c8a4157b1c |
| Headers | show |
| Series | strmap: make callers of strmap_remove() to call it in void context | expand |
> -----Original Message----- > From: Junio C Hamano <gitster@pobox.com> > Sent: December 15, 2020 4:26 PM > To: Elijah Newren <newren@gmail.com>; Randall S. Becker > <rsbecker@nexbridge.com> > Cc: Jeff King <peff@peff.net>; Git Mailing List <git@vger.kernel.org> > Subject: [PATCH] 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> > --- > strmap.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > 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) > -- > 2.30.0-rc0-186-g20447144ec Looks good from here. Regards, Randall
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)
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> --- strmap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)