mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check_and_emit_line(): rename and refactor

Browse Source 
The function name was too bland and not explicit enough as to what it is
checking.  Split it into two, and call the one that checks if there is a
whitespace breakage "ws_check()", and call the other one that checks and
emits the line after color coding "ws_check_emit()".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2008-06-26 15:35:21 -07:00
parent 5ff10dd602
commit 8f8841e9c8
4 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builtin-apply.c
View File

@ -979,8 +979,7 @@ static int find_header(char *line, unsigned long size, int *hdrsize, struct patc
static void check_whitespace(const char *line, int len, unsigned ws_rule)
{
char *err;
unsigned result = check_and_emit_line(line + 1, len - 1, ws_rule,
NULL, NULL, NULL, NULL);
unsigned result = ws_check(line + 1, len - 1, ws_rule);
if (!result)
return;
@ -991,7 +990,7 @@ static void check_whitespace(const char *line, int len, unsigned ws_rule)
else {
err = whitespace_error_string(result);
fprintf(stderr, "%s:%d: %s.\n%.*s\n",
patch_input_file, linenr, err, len - 2, line + 1);
patch_input_file, linenr, err, len - 2, line + 1);
free(err);
}
}