From: Ramsay Jones <ramsay@ramsayjones.plus.com>
To: Stefan Beller <sbeller@google.com>
Cc: Junio C Hamano <gitster@pobox.com>,
GIT Mailing-list <git@vger.kernel.org>
Subject: [PATCH] diff: mark some file local symbols as static
Date: Sun, 21 May 2017 00:37:45 +0100 [thread overview]
Message-ID: <578bfb5b-bdd1-a418-98f2-d26e1bff0be2@ramsayjones.plus.com> (raw)
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---
Hi Stefan,
If you need to re-roll your 'sb/diff-color-move' branch, could you
please squash this into to the relevant patches. (Each hunk would
be squashed into a separate commit, thus:
- commit 9b68d54c11, "diff: buffer all output if asked to"
- commit 4b71ba47ab, "submodule.c: convert show_submodule_summary to use emit_line_fmt"
- commit 703d25581d, "diff.c: convert show_stats to use emit_line_*"
).
Thanks!
ATB,
Ramsay Jones
diff.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/diff.c b/diff.c
index ba23c5862..15f389676 100644
--- a/diff.c
+++ b/diff.c
@@ -810,10 +810,10 @@ static void append_buffered_patch_line(struct diff_options *o,
f->line = e->line ? xmemdupz(e->line, e->len) : NULL;
}
-void emit_line(struct diff_options *o,
- const char *set, const char *reset,
- int add_line_prefix, int markup_ws,
- int sign, const char *line, int len)
+static void emit_line(struct diff_options *o,
+ const char *set, const char *reset,
+ int add_line_prefix, int markup_ws,
+ int sign, const char *line, int len)
{
struct buffered_patch_line e = {set, reset, line,
len, sign, add_line_prefix,
@@ -825,10 +825,10 @@ void emit_line(struct diff_options *o,
emit_buffered_patch_line(o, &e);
}
-void emit_line_fmt(struct diff_options *o,
- const char *set, const char *reset,
- int add_line_prefix,
- const char *fmt, ...)
+static void emit_line_fmt(struct diff_options *o,
+ const char *set, const char *reset,
+ int add_line_prefix,
+ const char *fmt, ...)
{
struct strbuf sb = STRBUF_INIT;
va_list ap;
@@ -1862,8 +1862,8 @@ static void fill_print_name(struct diffstat_file *file)
file->print_name = pname;
}
-void print_stat_summary_0(struct diff_options *options, int files,
- int insertions, int deletions)
+static void print_stat_summary_0(struct diff_options *options, int files,
+ int insertions, int deletions)
{
struct strbuf sb = STRBUF_INIT;
--
2.13.0
next reply other threads:[~2017-05-20 23:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-20 23:37 Ramsay Jones [this message]
2017-05-22 16:42 ` [PATCH] diff: mark some file local symbols as static Stefan Beller
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=578bfb5b-bdd1-a418-98f2-d26e1bff0be2@ramsayjones.plus.com \
--to=ramsay@ramsayjones.plus.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sbeller@google.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).