Re: [PATCH 1/2] strmap: do not "return" in a void function
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> On SunCC this is a hard error, and since this code first appears in
> the v2.30-0-rc0 release it won't build on Solaris SunCC.
I think we already have a fix for this.
Show 28 quoted lines
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
> strmap.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/strmap.h b/strmap.h
> index c4c104411bf..1e152d832d6 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)Junio C Hamano <gitster@pobox.com>