From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Elijah Newren" <newren@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 1/2] strmap: do not "return" in a void function
Date: Wed, 16 Dec 2020 00:50:26 +0100 [thread overview]
Message-ID: <20201215235027.10401-2-avarab@gmail.com> (raw)
In-Reply-To: <xmqq7dpkdup6.fsf@gitster.c.googlers.com>
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.
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)
--
2.29.2.222.g5d2a92d10f8
next prev parent reply other threads:[~2020-12-16 0:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-14 20:00 [ANNOUNCE] Git v2.30.0-rc0 Junio C Hamano
2020-12-15 23:50 ` [PATCH 0/2] Make v2.30.0-rc0 compile on SunCC Ævar Arnfjörð Bjarmason
2020-12-15 23:50 ` Ævar Arnfjörð Bjarmason [this message]
2020-12-16 0:24 ` [PATCH 1/2] strmap: do not "return" in a void function Junio C Hamano
2020-12-15 23:50 ` [PATCH 2/2] style: do not "break" in switch() after "return" Ævar Arnfjörð Bjarmason
2020-12-16 0:30 ` Junio C Hamano
2020-12-16 0:35 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201215235027.10401-2-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.