undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff.c: use diff_options directly

Browse Source 
The value of `ecbdata->opt` is accessible via the short variable `o`
already, so let's use that instead.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller 2016-09-07 16:36:44 -07:00 committed by Junio C Hamano
parent 6ebdac1bab
commit fb33b62ca6
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
diff.c
View File

@ -1217,7 +1217,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
const char *line_prefix = diff_line_prefix(o); const char *line_prefix = diff_line_prefix(o);
if (ecbdata->header) { if (ecbdata->header) {
fprintf(ecbdata->opt->file, "%s", ecbdata->header->buf); fprintf(o->file, "%s", ecbdata->header->buf);
strbuf_reset(ecbdata->header); strbuf_reset(ecbdata->header);
ecbdata->header = NULL; ecbdata->header = NULL;
} }
@ -1229,9 +1229,9 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : ""; name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : ""; name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
fprintf(ecbdata->opt->file, "%s%s--- %s%s%s\n", fprintf(o->file, "%s%s--- %s%s%s\n",
line_prefix, meta, ecbdata->label_path[0], reset, name_a_tab); line_prefix, meta, ecbdata->label_path[0], reset, name_a_tab);
fprintf(ecbdata->opt->file, "%s%s+++ %s%s%s\n", fprintf(o->file, "%s%s+++ %s%s%s\n",
line_prefix, meta, ecbdata->label_path[1], reset, name_b_tab); line_prefix, meta, ecbdata->label_path[1], reset, name_b_tab);
ecbdata->label_path[0] = ecbdata->label_path[1] = NULL; ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
} }
@ -1249,15 +1249,15 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
find_lno(line, ecbdata); find_lno(line, ecbdata);
emit_hunk_header(ecbdata, line, len); emit_hunk_header(ecbdata, line, len);
if (line[len-1] != '\n') if (line[len-1] != '\n')
putc('\n', ecbdata->opt->file); putc('\n', o->file);
return; return;
} }
if (len < 1) { if (len < 1) {
emit_line(ecbdata->opt, reset, reset, line, len); emit_line(o, reset, reset, line, len);
if (ecbdata->diff_words if (ecbdata->diff_words
&& ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) && ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN)
fputs("~\n", ecbdata->opt->file); fputs("~\n", o->file);
return; return;
} }
@ -1282,8 +1282,8 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
} }
diff_words_flush(ecbdata); diff_words_flush(ecbdata);
if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) { if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) {
emit_line(ecbdata->opt, context, reset, line, len); emit_line(o, context, reset, line, len);
fputs("~\n", ecbdata->opt->file); fputs("~\n", o->file);
} else { } else {
/* /*
* Skip the prefix character, if any. With * Skip the prefix character, if any. With
@ -1294,7 +1294,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
line++; line++;
len--; len--;
} }
emit_line(ecbdata->opt, context, reset, line, len); emit_line(o, context, reset, line, len);
} }
return; return;
} }
@ -1316,8 +1316,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
default: default:
/* incomplete line at the end */ /* incomplete line at the end */
ecbdata->lno_in_preimage++; ecbdata->lno_in_preimage++;
emit_line(ecbdata->opt, emit_line(o, diff_get_color(ecbdata->color_diff, DIFF_CONTEXT),
diff_get_color(ecbdata->color_diff, DIFF_CONTEXT),
reset, line, len); reset, line, len);
break; break;
} }