The argument list of emit_line_0 is just 2 more arguments that are
hard-coded in emit_line. Eliminate this intermediate function and
rename the remaining function by dropping the '_0'.
Signed-off-by: Stefan Beller <sbel...@google.com>
---
diff.c | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/diff.c b/diff.c
index 25735f03d2..3569857818 100644
--- a/diff.c
+++ b/diff.c
@@ -516,8 +516,8 @@ static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2,
ecbdata->blank_at_eof_in_postimage = (at - l2) + 1;
}
-static void emit_line_0(struct diff_options *o, const char *set, const char
*reset,
- int add_line_prefix, 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 sign, const char *line, int len)
{
int has_trailing_newline, has_trailing_carriage_return;
FILE *file = o->file;
@@ -547,12 +547,6 @@ static void emit_line_0(struct diff_options *o, const char
*set, const char *res
fputc('\n', file);
}
-static void emit_line(struct diff_options *o, const char *set, const char
*reset,
- const char *line, int len)
-{
- emit_line_0(o, set, reset, 1, 0, line, len);
-}
-
static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char
*line, int len)
{
if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
@@ -581,13 +575,13 @@ static void emit_line_checked(const char *reset,
}
if (!ws)
- emit_line_0(ecbdata->opt, set, reset, 1, sign, line, len);
+ emit_line(ecbdata->opt, set, reset, 1, sign, line, len);
else if (sign == '+' && new_blank_line_at_eof(ecbdata, line, len))
/* Blank line at EOF - paint '+' as well */
- emit_line_0(ecbdata->opt, ws, reset, 1, sign, line, len);
+ emit_line(ecbdata->opt, ws, reset, 1, sign, line, len);
else {
/* Emit just the prefix, then the rest. */
- emit_line_0(ecbdata->opt, set, reset, 1, sign, "", 0);
+ emit_line(ecbdata->opt, set, reset, 1, sign, "", 0);
ws_check_emit(line, len, ecbdata->ws_rule,
ecbdata->opt->file, set, reset, ws);
}
@@ -637,7 +631,7 @@ static void emit_hunk_header(struct emit_callback *ecbdata,
if (len < 10 ||
memcmp(line, atat, 2) ||
!(ep = memmem(line + 2, len - 2, atat, 2))) {
- emit_line(ecbdata->opt, context, reset, line, len);
+ emit_line(ecbdata->opt, context, reset, 1, 0, line, len);
return;
}
ep += 2; /* skip over @@ */
@@ -673,7 +667,7 @@ static void emit_hunk_header(struct emit_callback *ecbdata,
strbuf_add(&msgbuf, line + len, org_len - len);
strbuf_complete_line(&msgbuf);
- emit_line(ecbdata->opt, "", "", msgbuf.buf, msgbuf.len);
+ emit_line(ecbdata->opt, "", "", 1, 0, msgbuf.buf, msgbuf.len);
strbuf_release(&msgbuf);
}
@@ -736,8 +730,8 @@ static void emit_rewrite_lines(struct emit_callback *ecb,
const char *context = diff_get_color(ecb->color_diff,
DIFF_CONTEXT);
putc('\n', ecb->opt->file);
- emit_line_0(ecb->opt, context, reset, 1, '\\',
- nneof, strlen(nneof));
+ emit_line(ecb->opt, context, reset, 1, '\\',
+ nneof, strlen(nneof));
}
}
@@ -1335,7 +1329,7 @@ static void fn_out_consume(void *priv, char *line,
unsigned long len)
}
diff_words_flush(ecbdata);
if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) {
- emit_line(o, context, reset, line, len);
+ emit_line(o, context, reset, 1, 0, line, len);
fputs("~\n", o->file);
} else {
/*
@@ -1347,7 +1341,7 @@ static void fn_out_consume(void *priv, char *line,
unsigned long len)
line++;
len--;
}
- emit_line(o, context, reset, line, len);
+ emit_line(o, context, reset, 1, 0, line, len);
}
return;
}
@@ -1370,7 +1364,7 @@ static void fn_out_consume(void *priv, char *line,
unsigned long len)
/* incomplete line at the end */
ecbdata->lno_in_preimage++;
emit_line(o, diff_get_color(ecbdata->color_diff, DIFF_CONTEXT),
- reset, line, len);
+ reset, 1, 0, line, len);
break;
}
}
@@ -2182,7 +2176,7 @@ static void checkdiff_consume(void *priv, char *line,
unsigned long len)
fprintf(data->o->file, "%s%s:%d: %s.\n",
line_prefix, data->filename, data->lineno, err);
free(err);
- emit_line(data->o, set, reset, line, 1);
+ emit_line(data->o, set, reset, 1, 0, line, 1);
ws_check_emit(line + 1, len - 1, data->ws_rule,
data->o->file, set, reset, ws);
} else if (line[0] == ' ') {
@@ -4831,7 +4825,7 @@ void diff_flush(struct diff_options *options)
term[0] = options->line_termination;
term[1] = '\0';
- emit_line(options, NULL, NULL, term, !!term[0]);
+ emit_line(options, NULL, NULL, 1, 0, term, !!term[0]);
if (options->stat_sep) {
/* attach patch instead of inline */
fputs(options->stat_sep, options->file);
--
2.13.0.18.g7d86cc8ba0
