Skip to content

Commit

Permalink
diff --check: fix off by one error
Browse files Browse the repository at this point in the history
When parsing the diff line starting with '@@', the line number of the
'+' file is parsed. For the subsequent line parses, the line number
should therefore be incremented after the parse, not before it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Johannes Schindelin authored and Junio C Hamano committed Dec 22, 2006
1 parent ec72220 commit e6d40d6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -825,8 +825,6 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
if (line[0] == '+') {
int i, spaces = 0;

data->lineno++;

/* check space before tab */
for (i = 1; i < len && (line[i] == ' ' || line[i] == '\t'); i++)
if (line[i] == ' ')
Expand All @@ -841,6 +839,8 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
if (isspace(line[len - 1]))
printf("%s:%d: white space at end: %.*s\n",
data->filename, data->lineno, (int)len, line);

data->lineno++;
} else if (line[0] == ' ')
data->lineno++;
else if (line[0] == '@') {
Expand Down

0 comments on commit e6d40d6

Please sign in to comment.