[PATCH 7/8] diff.c: compute reverse locally in emit_line_0
Signed-off-by: Stefan Beller <sbeller@google.com>
---
diff.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/diff.c b/diff.c
index fdad7ffdd77..f565a2c0c2b 100644
--- a/diff.c
+++ b/diff.c
@@ -576,11 +576,12 @@ static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2,
}
static void emit_line_0(struct diff_options *o,
- const char *set_sign, const char *set, unsigned reverse, const char *reset,
+ const char *set_sign, const char *set, const char *reset,
int first, const char *line, int len)
{
int has_trailing_newline, has_trailing_carriage_return;
int nofirst;
+ int reverse = !!set && !!set_sign;
FILE *file = o->file;
fputs(diff_line_prefix(o), file);
@@ -625,7 +626,7 @@ static void emit_line_0(struct diff_options *o,
static void emit_line(struct diff_options *o, const char *set, const char *reset,
const char *line, int len)
{
- emit_line_0(o, set, NULL, 0, reset, line[0], line+1, len-1);
+ emit_line_0(o, set, NULL, reset, line[0], line+1, len-1);
}
enum diff_symbol {
@@ -998,15 +999,15 @@ static void emit_line_ws_markup(struct diff_options *o,
}
if (!ws && !set_sign)
- emit_line_0(o, set, NULL, 0, reset, sign, line, len);
+ emit_line_0(o, set, NULL, reset, sign, line, len);
else if (!ws) {
- emit_line_0(o, set_sign, set, !!set_sign, reset, sign, line, len);
+ emit_line_0(o, set_sign, set, reset, sign, line, len);
} else if (blank_at_eof)
/* Blank line at EOF - paint '+' as well */
- emit_line_0(o, ws, NULL, 0, reset, sign, line, len);
+ emit_line_0(o, ws, NULL, reset, sign, line, len);
else {
/* Emit just the prefix, then the rest. */
- emit_line_0(o, set_sign, set, !!set_sign, reset, sign, "", 0);
+ emit_line_0(o, set_sign, set, reset, sign, "", 0);
ws_check_emit(line, len, ws_rule,
o->file, set, reset, ws);
}
@@ -1029,7 +1030,7 @@ static void emit_diff_symbol_from_struct(struct diff_options *o,
context = diff_get_color_opt(o, DIFF_CONTEXT);
reset = diff_get_color_opt(o, DIFF_RESET);
putc('\n', o->file);
- emit_line_0(o, context, NULL, 0, reset, '\\',
+ emit_line_0(o, context, NULL, reset, '\\',
nneof, strlen(nneof));
break;
case DIFF_SYMBOL_SUBMODULE_HEADER:
--
2.18.0.132.g195c49a2227
Stefan Beller <sbeller@google.com>