Currently, diff output is written either through the emit_line_0
function or through the FILE * in struct diff_options directly. To
make it easier to teach diff to buffer its output (which will be done
in a subsequent commit), introduce a more flexible emit_line() function.
In this commit, direct usages of emit_line_0() are replaced with
emit_line(); subsequent commits will also replace usages of the
FILE * with emit().
Instead of having a 'first' parameter containing the first character
of a line, have a dedicated 'sign' parameter that is just set when
the first character of the line is part of the actual content, i.e.
' ', '+', '-'.
Signed-off-by: Stefan Beller <sbel...@google.com>
Signed-off-by: Junio C Hamano <gits...@pobox.com>
---
diff.c | 76 +++++++++++++++++++++++++++++-------------------------------------
1 file changed, 33 insertions(+), 43 deletions(-)
diff --git a/diff.c b/diff.c
index 2f9722b382..3569857818 100644
--- a/diff.c
+++ b/diff.c
@@ -516,36 +516,30 @@ 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 first, 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;
- int nofirst;
FILE *file = o->file;
- fputs(diff_line_prefix(o), file);
+ if (add_line_prefix)
+ fputs(diff_line_prefix(o), file);
- if (len == 0) {
- has_trailing_newline = (first == '\n');
- has_trailing_carriage_return = (!has_trailing_newline &&
- (first == '\r'));
- nofirst = has_trailing_newline || has_trailing_carriage_return;
- } else {
- has_trailing_newline = (len > 0 && line[len-1] == '\n');
- if (has_trailing_newline)
- len--;
- has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
- if (has_trailing_carriage_return)
- len--;
- nofirst = 0;
- }
+ has_trailing_newline = (len > 0 && line[len-1] == '\n');
+ if (has_trailing_newline)
+ len--;
+ has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
+ if (has_trailing_carriage_return)
+ len--;
- if (len || !nofirst) {
- fputs(set, file);
- if (!nofirst)
- fputc(first, file);
+ if (len || sign) {
+ if (set)
+ fputs(set, file);
+ if (sign)
+ fputc(sign, file);
fwrite(line, len, 1, file);
- fputs(reset, file);
+ if (reset)
+ fputs(reset, file);
}
if (has_trailing_carriage_return)
fputc('\r', file);
@@ -553,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, line[0], line+1, len-1);
-}
-
static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char
*line, int len)
{
if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
@@ -587,13 +575,13 @@ static void emit_line_checked(const char *reset,
}
if (!ws)
- emit_line_0(ecbdata->opt, set, reset, 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, 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, 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);
}
@@ -643,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 @@ */
@@ -679,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);
}
@@ -742,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, '\\',
- nneof, strlen(nneof));
+ emit_line(ecb->opt, context, reset, 1, '\\',
+ nneof, strlen(nneof));
}
}
@@ -1341,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 {
/*
@@ -1353,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;
}
@@ -1376,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;
}
}
@@ -2188,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] == ' ') {
@@ -4833,9 +4821,11 @@ void diff_flush(struct diff_options *options)
if (output_format & DIFF_FORMAT_PATCH) {
if (separator) {
- fprintf(options->file, "%s%c",
- diff_line_prefix(options),
- options->line_termination);
+ char term[2];
+ term[0] = options->line_termination;
+ term[1] = '\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
