[PATCH 4/6] diff: add diff_line_prefix function
- From
John Keeping <john@keeping.me.uk>
- Date
- Feb 7, 2013, 20:15 UTC
- Message-ID
- <dfb0c8fc336ae6e125e5307311e8b49425d06aa5.1360267849.git.john@keeping.me.uk>
- In-Reply-To
- <cover.1360267849.git.john@keeping.me.uk>
This is a helper function to call the diff output_prefix function and return its value as a C string, allowing us to greatly simplify everywhere that needs to get the output prefix.
Signed-off-by: John Keeping <john@keeping.me.uk> --- diff.c | 10 ++++++++++ diff.h | 3 +++ 2 files changed, 13 insertions(+)
diff --git a/diff.c b/diff.c index 73ae02d..ed14d5d 100644 --- a/diff.c +++ b/diff.c @@ -1105,6 +1105,16 @@ const char *diff_get_color(int diff_use_color, enum color_diff ix) return ""; } +const char *diff_line_prefix(struct diff_options *opt) +{ + struct strbuf *msgbuf; + if (!opt->output_prefix) + return ""; + + msgbuf = opt->output_prefix(opt, opt->output_prefix_data); + return msgbuf->buf; +} + static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len) { const char *cp; diff --git a/diff.h b/diff.h index a47bae4..76830e2 100644 --- a/diff.h +++ b/diff.h @@ -174,6 +174,9 @@ const char *diff_get_color(int diff_use_color, enum color_diff ix); diff_get_color((o)->use_color, ix) +const char *diff_line_prefix(struct diff_options *); + + extern const char mime_boundary_leader[]; extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
-- 1.8.1.2