From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
David Aguilar <davvid@gmail.com>,
Ramsay Jones <ramsay@ramsayjones.plus.com>,
GIT Mailing-list <git@vger.kernel.org>
Subject: Re: Fixing the warning about warning(""); was: Re: [PATCH] difftool.c: mark a file-local symbol with static
Date: Wed, 25 Jan 2017 13:28:27 -0800 [thread overview]
Message-ID: <xmqq7f5iakxw.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170125183542.pe5qolexqqx6jhsi@sigill.intra.peff.net> (Jeff King's message of "Wed, 25 Jan 2017 13:35:42 -0500")
Jeff King <peff@peff.net> writes:
> The only advantage is that it is self-documenting, so somebody does not
> come through later and convert ("%s", "") back to (""). We could also
> write a comment. But I am happy if we simply catch it in review (or
> preferably the person is clueful enough to read the output of git-blame
> and see why it is that way in the first place).
And the last sentence unfortunatly does not reflect reality.
I would prefer something self-documenting, like your wrapper with a
comment. Then somebody who is looking at the implementation of
warning_blank_line() will not get tempted to turn "%s", "" into ""
because of the comment. And somebody who is looking at the callsite
of warning_blank_line() will think twice before suggesting to turn
it into warning("").
That does not make it unnecessary to review; we still need to catch
those who wants to add new calls to warning("") without even knowing
the presence of warning_blank_line(), if the original codepath being
touched does not have any call to it.
> So maybe:
In any case, the patch is a minimum effort band-aid that lets us
punt on the whole issue for now, so I'll queue it as-is.
Thanks.
> -- >8 --
> Subject: [PATCH] difftool: hack around -Wzero-length-format warning
>
> Building with "gcc -Wall" will complain that the format in:
>
> warning("")
>
> is empty. Which is true, but the warning is over-eager. We
> are calling the function for its side effect of printing
> "warning:", even with an empty string.
>
> Our DEVELOPER Makefile knob disables the warning, but not
> everybody uses it. Let's silence the warning in the code so
> that nobody reports it or tries to "fix" it.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> builtin/difftool.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/difftool.c b/builtin/difftool.c
> index 42ad9e804..b5e85ab07 100644
> --- a/builtin/difftool.c
> +++ b/builtin/difftool.c
> @@ -567,7 +567,7 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
> warning(_("both files modified: '%s' and '%s'."),
> wtdir.buf, rdir.buf);
> warning(_("working tree file has been left."));
> - warning("");
> + warning("%s", "");
> err = 1;
> } else if (unlink(wtdir.buf) ||
> copy_file(wtdir.buf, rdir.buf, st.st_mode))
next prev parent reply other threads:[~2017-01-25 21:29 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-29 17:36 [PATCH] difftool.c: mark a file-local symbol with static Ramsay Jones
2016-11-30 11:07 ` Johannes Schindelin
2016-11-30 19:57 ` Ramsay Jones
2016-11-30 20:40 ` Junio C Hamano
2016-11-30 21:25 ` Jeff King
2016-11-30 22:37 ` Ramsay Jones
2016-11-30 23:18 ` Jeff King
2016-11-30 23:46 ` Junio C Hamano
2016-12-01 1:18 ` Ramsay Jones
2016-12-01 4:02 ` Jeff King
2016-12-01 18:20 ` Junio C Hamano
2016-12-01 18:50 ` Jeff King
2017-01-22 5:26 ` David Aguilar
2017-01-24 14:23 ` Jeff King
2017-01-24 21:52 ` Junio C Hamano
2017-01-24 23:05 ` Jeff King
2017-01-25 10:36 ` Fixing the warning about warning(""); was: " Johannes Schindelin
2017-01-25 18:35 ` Jeff King
2017-01-25 21:28 ` Junio C Hamano [this message]
2017-01-25 22:01 ` Jeff King
2017-01-26 6:39 ` Johannes Sixt
2017-01-26 11:37 ` Johannes Schindelin
2017-01-26 14:35 ` Jeff King
2017-01-26 14:32 ` Jeff King
2017-01-26 18:26 ` Junio C Hamano
2017-01-26 11:16 ` Johannes Schindelin
2017-01-26 14:39 ` Jeff King
2017-01-26 14:49 ` Johannes Schindelin
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=xmqq7f5iakxw.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.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).