mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

line-log: use diff_line_prefix() instead of custom helper

Browse Source 
Our local output_prefix() is exactly the same as the public
diff_line_prefix() function. Let's just use that one, saving us a little
bit of code.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2024-10-03 17:06:27 -04:00
committed by Junio C Hamano
parent fc5589d6c1
commit 8aeff2c287
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
line-log.c
View File

@ -897,16 +897,6 @@ static void print_line(const char *prefix, char first,
fputs("\\ No newline at end of file\n", file); fputs("\\ No newline at end of file\n", file);
} }
static const char *output_prefix(struct diff_options *opt)
{
if (opt->output_prefix) {
struct strbuf *sb = opt->output_prefix(opt, opt->output_prefix_data);
return sb->buf;
} else {
return "";
}
}
static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *range) static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *range)
{ {
unsigned int i, j = 0; unsigned int i, j = 0;
@ -916,7 +906,7 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
struct diff_ranges *diff = &range->diff; struct diff_ranges *diff = &range->diff;
struct diff_options *opt = &rev->diffopt; struct diff_options *opt = &rev->diffopt;
const char *prefix = output_prefix(opt); const char *prefix = diff_line_prefix(opt);
const char *c_reset = diff_get_color(opt->use_color, DIFF_RESET); const char *c_reset = diff_get_color(opt->use_color, DIFF_RESET);
const char *c_frag = diff_get_color(opt->use_color, DIFF_FRAGINFO); const char *c_frag = diff_get_color(opt->use_color, DIFF_FRAGINFO);
const char *c_meta = diff_get_color(opt->use_color, DIFF_METAINFO); const char *c_meta = diff_get_color(opt->use_color, DIFF_METAINFO);
@ -1011,7 +1001,7 @@ out:
*/ */
static void dump_diff_hacky(struct rev_info *rev, struct line_log_data *range) static void dump_diff_hacky(struct rev_info *rev, struct line_log_data *range)
{ {
const char *prefix = output_prefix(&rev->diffopt); const char *prefix = diff_line_prefix(&rev->diffopt);
fprintf(rev->diffopt.file, "%s\n", prefix); fprintf(rev->diffopt.file, "%s\n", prefix);