Skip to content

Commit d070d39

Browse files
stefanbellergitster
authored andcommitted
diff.c: compute reverse locally in emit_line_0
Signed-off-by: Stefan Beller <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7581e16 commit d070d39

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

diff.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -576,11 +576,12 @@ static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2,
576576
}
577577

578578
static void emit_line_0(struct diff_options *o,
579-
const char *set_sign, const char *set, unsigned reverse, const char *reset,
579+
const char *set_sign, const char *set, const char *reset,
580580
int first, const char *line, int len)
581581
{
582582
int has_trailing_newline, has_trailing_carriage_return;
583583
int nofirst;
584+
int reverse = !!set && !!set_sign;
584585
FILE *file = o->file;
585586

586587
fputs(diff_line_prefix(o), file);
@@ -625,7 +626,7 @@ static void emit_line_0(struct diff_options *o,
625626
static void emit_line(struct diff_options *o, const char *set, const char *reset,
626627
const char *line, int len)
627628
{
628-
emit_line_0(o, set, NULL, 0, reset, line[0], line+1, len-1);
629+
emit_line_0(o, set, NULL, reset, line[0], line+1, len-1);
629630
}
630631

631632
enum diff_symbol {
@@ -998,15 +999,15 @@ static void emit_line_ws_markup(struct diff_options *o,
998999
}
9991000

10001001
if (!ws && !set_sign)
1001-
emit_line_0(o, set, NULL, 0, reset, sign, line, len);
1002+
emit_line_0(o, set, NULL, reset, sign, line, len);
10021003
else if (!ws) {
1003-
emit_line_0(o, set_sign, set, !!set_sign, reset, sign, line, len);
1004+
emit_line_0(o, set_sign, set, reset, sign, line, len);
10041005
} else if (blank_at_eof)
10051006
/* Blank line at EOF - paint '+' as well */
1006-
emit_line_0(o, ws, NULL, 0, reset, sign, line, len);
1007+
emit_line_0(o, ws, NULL, reset, sign, line, len);
10071008
else {
10081009
/* Emit just the prefix, then the rest. */
1009-
emit_line_0(o, set_sign, set, !!set_sign, reset, sign, "", 0);
1010+
emit_line_0(o, set_sign, set, reset, sign, "", 0);
10101011
ws_check_emit(line, len, ws_rule,
10111012
o->file, set, reset, ws);
10121013
}
@@ -1029,7 +1030,7 @@ static void emit_diff_symbol_from_struct(struct diff_options *o,
10291030
context = diff_get_color_opt(o, DIFF_CONTEXT);
10301031
reset = diff_get_color_opt(o, DIFF_RESET);
10311032
putc('\n', o->file);
1032-
emit_line_0(o, context, NULL, 0, reset, '\\',
1033+
emit_line_0(o, context, NULL, reset, '\\',
10331034
nneof, strlen(nneof));
10341035
break;
10351036
case DIFF_SYMBOL_SUBMODULE_HEADER:

0 commit comments

Comments
 (0)