From: Ramsay Jones <ramsay@ramsayjones.plus.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Junio C Hamano <gitster@pobox.com>,
GIT Mailing-list <git@vger.kernel.org>
Subject: [PATCH] difftool.c: mark a file-local symbol with static
Date: Tue, 29 Nov 2016 17:36:24 +0000 [thread overview]
Message-ID: <4ddad7ea-5ac8-20b2-da9e-5843c486878a@ramsayjones.plus.com> (raw)
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---
Hi Johannes,
If you need to re-roll your 'js/difftool-builtin' branch, could
you please squash this into the relevant patch.
Thanks!
Also, due to a problem in my config.mak file on Linux (a commented
out line that had a line continuation '\', grrrrr!), gcc issued a
warning, thus:
builtin/difftool.c: In function ‘run_dir_diff’:
builtin/difftool.c:568:13: warning: zero-length gnu_printf format string [-Wformat-zero-length]
warning("");
^
I am not sure why -Wno-format-zero-length is set in DEVELOPER_CFLAGS,
but do you really need to space the output with an an 'empty'
"warning:" line? (Just curious).
ATB,
Ramsay Jones
builtin/difftool.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/difftool.c b/builtin/difftool.c
index 3480920..830369c 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -170,7 +170,7 @@ struct path_entry {
char path[FLEX_ARRAY];
};
-int path_entry_cmp(struct path_entry *a, struct path_entry *b, void *key)
+static int path_entry_cmp(struct path_entry *a, struct path_entry *b, void *key)
{
return strcmp(a->path, key ? key : b->path);
}
--
2.9.0
next reply other threads:[~2016-11-29 17:36 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-29 17:36 Ramsay Jones [this message]
2016-11-30 11:07 ` [PATCH] difftool.c: mark a file-local symbol with static 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
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=4ddad7ea-5ac8-20b2-da9e-5843c486878a@ramsayjones.plus.com \
--to=ramsay@ramsayjones.plus.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).