From: Junio C Hamano <gitster@pobox.com>
To: "Randall S. Becker" <rsbecker@nexbridge.com>
Cc: <git@vger.kernel.org>
Subject: Re: [ANNOUNCE] git-2.30.0-rc0 - Compile Fails on HPE NonStop
Date: Mon, 14 Dec 2020 18:43:36 -0800 [thread overview]
Message-ID: <xmqqeejraiw7.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <035d01d6d26e$8c255260$a46ff720$@nexbridge.com> (Randall S. Becker's message of "Mon, 14 Dec 2020 18:12:03 -0500")
"Randall S. Becker" <rsbecker@nexbridge.com> writes:
> 2.30.0-rc0 fails to compile strmap.o, and probably others, since this is in
> a header file:
>
> "git-compat-util.h", line 277: warning(1252):
> missing return statement at end of non-void function "setitimer"
Thanks for reporting. I guess nobody without setitimer bothered to
test, since 15b52a44 (compat-util: type-check parameters of no-op
replacement functions, 2020-08-06) which was a tad before 2.29 was
tagged.
diff --git c/git-compat-util.h w/git-compat-util.h
index 7d509c5022..58cd0761be 100644
--- c/git-compat-util.h
+++ w/git-compat-util.h
@@ -273,7 +273,8 @@ struct itimerval {
#ifdef NO_SETITIMER
static inline int setitimer(int which, const struct itimerval *value, struct itimerval *newvalue) {
- ; /* nothing */
+ errno = ENOSYS;
+ return -1; /* not implemented */
}
#endif
Alternatively we could pretend that the call always succeeds by
without touching errno and returning 0. That might be safer, but I
dunno which one we want, and I do not have a system affected by the
choice.
> return strmap_remove(&map->map, str, 0);
> ^
> "strmap.h", line 168: error(210):
> a void function may not return a value
>
> return strmap_remove(&set->map, str, 0);
> ^
> "strmap.h", line 252: error(210):
> a void function may not return a value
This is a GNU extension biting us, perhaps?
Apparently these came from 4fa1d501 (strmap: add functions
facilitating use as a string->int map, 2020-11-05).
> Aside from inlining bodies, this should not have compiled on any platform:
>
> static inline void strset_remove(struct strset *set, const char *str)
> {
> return strmap_remove(&set->map, str, 0);
> }
>
> What is really intended here?
I think we should just drop "return"; a void function should be
called in void context without requiring a value, even if that
return expects no value.
diff --git i/strmap.h w/strmap.h
index c4c104411b..1e152d832d 100644
--- i/strmap.h
+++ w/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)
> Sorry,
> Randall
Thanks.
next prev parent reply other threads:[~2020-12-15 2:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-14 23:12 [ANNOUNCE] git-2.30.0-rc0 - Compile Fails on HPE NonStop Randall S. Becker
2020-12-15 2:43 ` Junio C Hamano [this message]
2020-12-15 2:52 ` Jeff King
2020-12-15 15:55 ` Randall S. Becker
2020-12-15 16:21 ` Elijah Newren
2020-12-15 21:07 ` Junio C Hamano
2020-12-15 21:08 ` Junio C Hamano
2020-12-15 21:25 ` [PATCH] strmap: make callers of strmap_remove() to call it in void context Junio C Hamano
2020-12-15 21:35 ` Randall S. Becker
2020-12-15 21:26 ` [PATCH] compat-util: pretend that stub setitimer() always succeeds Junio C Hamano
2020-12-15 21:37 ` [ANNOUNCE] git-2.30.0-rc0 - Compile Fails on HPE NonStop Jeff King
2020-12-16 17:27 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqeejraiw7.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=rsbecker@nexbridge.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).