kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

diff: drop unused color reset parameters 

Several of the emit_* functions take a "reset" color parameter, but
never actually look at it (instead, they call into emit_diff_symbol,
which handles the colors itself). Let's drop these unused parameters.

Note that emit_line() does still take a color/reset pair, and actually
uses it. It cannot be refactored to match these other functions because
it's the thing that emit_diff_symbol eventually calls into (i.e., it
does not by itself know which colors to use, and must be told by the
caller).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2019-02-14 00:48:13 -05:00 committed by Junio C Hamano
parent 784c0daed5
commit e04df61256
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
diff.c
View File

@ -1613,8 +1613,7 @@ static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line
return ws_blank_line(line, len, ecbdata->ws_rule); return ws_blank_line(line, len, ecbdata->ws_rule);
} }


static void emit_add_line(const char *reset, static void emit_add_line(struct emit_callback *ecbdata,
struct emit_callback *ecbdata,
const char *line, int len) const char *line, int len)
{ {
unsigned flags = WSEH_NEW | ecbdata->ws_rule; unsigned flags = WSEH_NEW | ecbdata->ws_rule;
@ -1624,16 +1623,14 @@ static void emit_add_line(const char *reset,
emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_PLUS, line, len, flags); emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_PLUS, line, len, flags);
} }


static void emit_del_line(const char *reset, static void emit_del_line(struct emit_callback *ecbdata,
struct emit_callback *ecbdata,
const char *line, int len) const char *line, int len)
{ {
unsigned flags = WSEH_OLD | ecbdata->ws_rule; unsigned flags = WSEH_OLD | ecbdata->ws_rule;
emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_MINUS, line, len, flags); emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_MINUS, line, len, flags);
} }


static void emit_context_line(const char *reset, static void emit_context_line(struct emit_callback *ecbdata,
struct emit_callback *ecbdata,
const char *line, int len) const char *line, int len)
{ {
unsigned flags = WSEH_CONTEXT | ecbdata->ws_rule; unsigned flags = WSEH_CONTEXT | ecbdata->ws_rule;
@ -1742,7 +1739,6 @@ static void emit_rewrite_lines(struct emit_callback *ecb,
int prefix, const char *data, int size) int prefix, const char *data, int size)
{ {
const char *endp = NULL; const char *endp = NULL;
const char *reset = diff_get_color(ecb->color_diff, DIFF_RESET);


while (0 < size) { while (0 < size) {
int len; int len;
@ -1751,10 +1747,10 @@ static void emit_rewrite_lines(struct emit_callback *ecb,
len = endp ? (endp - data + 1) : size; len = endp ? (endp - data + 1) : size;
if (prefix != '+') { if (prefix != '+') {
ecb->lno_in_preimage++; ecb->lno_in_preimage++;
emit_del_line(reset, ecb, data, len); emit_del_line(ecb, data, len);
} else { } else {
ecb->lno_in_postimage++; ecb->lno_in_postimage++;
emit_add_line(reset, ecb, data, len); emit_add_line(ecb, data, len);
} }
size -= len; size -= len;
data += len; data += len;
@ -2325,7 +2321,6 @@ static void find_lno(const char *line, struct emit_callback *ecbdata)
static void fn_out_consume(void *priv, char *line, unsigned long len) static void fn_out_consume(void *priv, char *line, unsigned long len)
{ {
struct emit_callback *ecbdata = priv; struct emit_callback *ecbdata = priv;
const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
struct diff_options *o = ecbdata->opt; struct diff_options *o = ecbdata->opt;


o->found_changes = 1; o->found_changes = 1;
@ -2392,16 +2387,16 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
switch (line[0]) { switch (line[0]) {
case '+': case '+':
ecbdata->lno_in_postimage++; ecbdata->lno_in_postimage++;
emit_add_line(reset, ecbdata, line + 1, len - 1); emit_add_line(ecbdata, line + 1, len - 1);
break; break;
case '-': case '-':
ecbdata->lno_in_preimage++; ecbdata->lno_in_preimage++;
emit_del_line(reset, ecbdata, line + 1, len - 1); emit_del_line(ecbdata, line + 1, len - 1);
break; break;
case ' ': case ' ':
ecbdata->lno_in_postimage++; ecbdata->lno_in_postimage++;
ecbdata->lno_in_preimage++; ecbdata->lno_in_preimage++;
emit_context_line(reset, ecbdata, line + 1, len - 1); emit_context_line(ecbdata, line + 1, len - 1);
break; break;
default: default:
/* incomplete line at the end */ /* incomplete line at the end */