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

Merge branch 'sb/diff-cleanup' into maint

Browse Source 
Code cleanup.

* sb/diff-cleanup:
  diff: remove dead code
  diff: omit found pointer from emit_callback
  diff.c: use diff_options directly
This commit is contained in:
Junio C Hamano 2016-09-19 13:51:45 -07:00
commit ddf8ee859f
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
diff.c
View File

@ -354,7 +354,6 @@ struct emit_callback {
const char **label_path; const char **label_path;
struct diff_words_data *diff_words; struct diff_words_data *diff_words;
struct diff_options *opt; struct diff_options *opt;
int *found_changesp;
struct strbuf *header; struct strbuf *header;
}; };
@ -722,7 +721,6 @@ static void emit_rewrite_diff(const char *name_a,
memset(&ecbdata, 0, sizeof(ecbdata)); memset(&ecbdata, 0, sizeof(ecbdata));
ecbdata.color_diff = want_color(o->use_color); ecbdata.color_diff = want_color(o->use_color);
ecbdata.found_changesp = &o->found_changes;
ecbdata.ws_rule = whitespace_rule(name_b); ecbdata.ws_rule = whitespace_rule(name_b);
ecbdata.opt = o; ecbdata.opt = o;
if (ecbdata.ws_rule & WS_BLANK_AT_EOF) { if (ecbdata.ws_rule & WS_BLANK_AT_EOF) {
@ -1216,12 +1214,13 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
struct diff_options *o = ecbdata->opt; struct diff_options *o = ecbdata->opt;
const char *line_prefix = diff_line_prefix(o); const char *line_prefix = diff_line_prefix(o);
o->found_changes = 1;
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;
} }
*(ecbdata->found_changesp) = 1;
if (ecbdata->label_path[0]) { if (ecbdata->label_path[0]) {
const char *name_a_tab, *name_b_tab; const char *name_a_tab, *name_b_tab;
@ -1229,9 +1228,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 +1248,7 @@ 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;
}
if (len < 1) {
emit_line(ecbdata->opt, reset, reset, line, len);
if (ecbdata->diff_words
&& ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN)
fputs("~\n", ecbdata->opt->file);
return; return;
} }
@ -1282,8 +1273,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 +1285,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 +1307,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;
} }
@ -2438,7 +2428,6 @@ static void builtin_diff(const char *name_a,
memset(&ecbdata, 0, sizeof(ecbdata)); memset(&ecbdata, 0, sizeof(ecbdata));
ecbdata.label_path = lbl; ecbdata.label_path = lbl;
ecbdata.color_diff = want_color(o->use_color); ecbdata.color_diff = want_color(o->use_color);
ecbdata.found_changesp = &o->found_changes;
ecbdata.ws_rule = whitespace_rule(name_b); ecbdata.ws_rule = whitespace_rule(name_b);
if (ecbdata.ws_rule & WS_BLANK_AT_EOF) if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
check_blank_at_eof(&mf1, &mf2, &ecbdata); check_blank_at_eof(&mf1, &mf2, &ecbdata);