From: David Aguilar <davvid@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>,
Ramsay Jones <ramsay@ramsayjones.plus.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
GIT Mailing-list <git@vger.kernel.org>
Subject: Re: [PATCH] difftool.c: mark a file-local symbol with static
Date: Sat, 21 Jan 2017 21:26:08 -0800 [thread overview]
Message-ID: <20170122052608.tpr5pihfgafhoynj@gmail.com> (raw)
In-Reply-To: <20161201185056.eso5rhec7izlbywa@sigill.intra.peff.net>
On Thu, Dec 01, 2016 at 01:50:57PM -0500, Jeff King wrote:
> On Thu, Dec 01, 2016 at 10:20:50AM -0800, Junio C Hamano wrote:
> > I also still think that any_printf_like_function("%s", "") looks
> > silly. I know that we've already started moving in that direction
> > and we stopped at a place we do not want to be in, but perhaps it
> > was a mistake to move in that direction in the first place. I am
> > tempted to say we should do something like the attached, but that
> > may not fly well, as I suspect that -Wno-format-zero-length may be a
> > lot more exotic than the -Wall compiler option.
>
> Yeah, I think portability concerns are what caused us not to go down
> that road in the first place.
> makes it harder to disable if your compiler doesn't like it.
>
> > An obvious second
> > best option would be to drop -Wall from the "everybody" CFLAGS and
> > move it to DEVELOPER_CFLAGS instead.
>
> Yeah, though that doesn't help the example above.
>
> As ugly as warning("%s", "") is, I think it may be the thing that annoys
> the smallest number of people.
>
> -Peff
How about using warning(" ") instead?
For difftool.c specifically, the following is a fine solution,
and doesn't require that we change our warning flags just for
this one file.
--
David
--- 8< ---
From 28bdc381202ced35399cfdf4899a019b0000c7a0 Mon Sep 17 00:00:00 2001
From: David Aguilar <davvid@gmail.com>
Date: Sat, 21 Jan 2017 21:21:09 -0800
Subject: [PATCH] difftool: avoid zero-length format string
The purpose of the warning("") line is to add an empty line to
improve the readability of the message.
Use warning(" ") instead to avoid zero-length format string
warnings while retaining the desired behavior.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
builtin/difftool.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/difftool.c b/builtin/difftool.c
index 42ad9e804a..d9f8ada291 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(" ");
err = 1;
} else if (unlink(wtdir.buf) ||
copy_file(wtdir.buf, rdir.buf, st.st_mode))
--
2.11.0.747.g28bdc38120
next prev parent reply other threads:[~2017-01-22 5:26 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 [this message]
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
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=20170122052608.tpr5pihfgafhoynj@gmail.com \
--to=davvid@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).