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

checkdiff: pass diff_options to the callback

Browse Source 
This way, we could later use more information from the diff_options.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2008-06-26 15:36:34 -07:00
parent 8f8841e9c8
commit 1ba111d1d6
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
diff.c
View File

@ -1136,18 +1136,19 @@ static void free_diffstat_info(struct diffstat_t *diffstat)
struct checkdiff_t { struct checkdiff_t {
struct xdiff_emit_state xm; struct xdiff_emit_state xm;
const char *filename; const char *filename;
int lineno, color_diff; int lineno;
struct diff_options *o;
unsigned ws_rule; unsigned ws_rule;
unsigned status; unsigned status;
FILE *file;
}; };
static void checkdiff_consume(void *priv, char *line, unsigned long len) static void checkdiff_consume(void *priv, char *line, unsigned long len)
{ {
struct checkdiff_t *data = priv; struct checkdiff_t *data = priv;
const char *ws = diff_get_color(data->color_diff, DIFF_WHITESPACE); int color_diff = DIFF_OPT_TST(data->o, COLOR_DIFF);
const char *reset = diff_get_color(data->color_diff, DIFF_RESET); const char *ws = diff_get_color(color_diff, DIFF_WHITESPACE);
const char *set = diff_get_color(data->color_diff, DIFF_FILE_NEW); const char *reset = diff_get_color(color_diff, DIFF_RESET);
const char *set = diff_get_color(color_diff, DIFF_FILE_NEW);
char *err; char *err;
if (line[0] == '+') { if (line[0] == '+') {
@ -1158,11 +1159,12 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
return; return;
data->status |= bad; data->status |= bad;
err = whitespace_error_string(bad); err = whitespace_error_string(bad);
fprintf(data->file, "%s:%d: %s.\n", data->filename, data->lineno, err); fprintf(data->o->file, "%s:%d: %s.\n",
data->filename, data->lineno, err);
free(err); free(err);
emit_line(data->file, set, reset, line, 1); emit_line(data->o->file, set, reset, line, 1);
ws_check_emit(line + 1, len - 1, data->ws_rule, ws_check_emit(line + 1, len - 1, data->ws_rule,
data->file, set, reset, ws); data->o->file, set, reset, ws);
} else if (line[0] == ' ') } else if (line[0] == ' ')
data->lineno++; data->lineno++;
else if (line[0] == '@') { else if (line[0] == '@') {
@ -1557,9 +1559,8 @@ static void builtin_checkdiff(const char *name_a, const char *name_b,
data.xm.consume = checkdiff_consume; data.xm.consume = checkdiff_consume;
data.filename = name_b ? name_b : name_a; data.filename = name_b ? name_b : name_a;
data.lineno = 0; data.lineno = 0;
data.color_diff = DIFF_OPT_TST(o, COLOR_DIFF); data.o = o;
data.ws_rule = whitespace_rule(attr_path); data.ws_rule = whitespace_rule(attr_path);
data.file = o->file;
if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0) if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
die("unable to read files to diff"); die("unable to read files to diff");