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

Merge branch 'sb/diff-emit-line-ws-markup-cleanup'

Browse Source 
Code clean-up.

* sb/diff-emit-line-ws-markup-cleanup:
  diff.c: pass sign_index to emit_line_ws_markup
This commit is contained in:
Junio C Hamano 2018-10-26 14:22:13 +09:00
commit d1f96fd84d
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
diff.c
View File

@ -1217,10 +1217,11 @@ static void dim_moved_lines(struct diff_options *o)
static void emit_line_ws_markup(struct diff_options *o, static void emit_line_ws_markup(struct diff_options *o,
const char *set_sign, const char *set, const char *set_sign, const char *set,
const char *reset, const char *reset,
char sign, const char *line, int len, int sign_index, const char *line, int len,
unsigned ws_rule, int blank_at_eof) unsigned ws_rule, int blank_at_eof)
{ {
const char *ws = NULL; const char *ws = NULL;
int sign = o->output_indicators[sign_index];
if (o->ws_error_highlight & ws_rule) { if (o->ws_error_highlight & ws_rule) {
ws = diff_get_color_opt(o, DIFF_WHITESPACE); ws = diff_get_color_opt(o, DIFF_WHITESPACE);
@ -1300,8 +1301,7 @@ static void emit_diff_symbol_from_struct(struct diff_options *o,
set = diff_get_color_opt(o, DIFF_FILE_OLD); set = diff_get_color_opt(o, DIFF_FILE_OLD);
} }
emit_line_ws_markup(o, set_sign, set, reset, emit_line_ws_markup(o, set_sign, set, reset,
o->output_indicators[OUTPUT_INDICATOR_CONTEXT], OUTPUT_INDICATOR_CONTEXT, line, len,
line, len,
flags & (DIFF_SYMBOL_CONTENT_WS_MASK), 0); flags & (DIFF_SYMBOL_CONTENT_WS_MASK), 0);
break; break;
case DIFF_SYMBOL_PLUS: case DIFF_SYMBOL_PLUS:
@ -1345,8 +1345,7 @@ static void emit_diff_symbol_from_struct(struct diff_options *o,
flags &= ~DIFF_SYMBOL_CONTENT_WS_MASK; flags &= ~DIFF_SYMBOL_CONTENT_WS_MASK;
} }
emit_line_ws_markup(o, set_sign, set, reset, emit_line_ws_markup(o, set_sign, set, reset,
o->output_indicators[OUTPUT_INDICATOR_NEW], OUTPUT_INDICATOR_NEW, line, len,
line, len,
flags & DIFF_SYMBOL_CONTENT_WS_MASK, flags & DIFF_SYMBOL_CONTENT_WS_MASK,
flags & DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF); flags & DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF);
break; break;
@ -1390,8 +1389,7 @@ static void emit_diff_symbol_from_struct(struct diff_options *o,
set = diff_get_color_opt(o, DIFF_CONTEXT_DIM); set = diff_get_color_opt(o, DIFF_CONTEXT_DIM);
} }
emit_line_ws_markup(o, set_sign, set, reset, emit_line_ws_markup(o, set_sign, set, reset,
o->output_indicators[OUTPUT_INDICATOR_OLD], OUTPUT_INDICATOR_OLD, line, len,
line, len,
flags & DIFF_SYMBOL_CONTENT_WS_MASK, 0); flags & DIFF_SYMBOL_CONTENT_WS_MASK, 0);
break; break;
case DIFF_SYMBOL_WORDS_PORCELAIN: case DIFF_SYMBOL_WORDS_PORCELAIN: