From: J. Bruce Fields Date: Sun, 16 Dec 2007 17:58:01 +0000 (-0500) Subject: builtin-apply: minor cleanup of whitespace detection X-Git-Tag: v1.5.4-rc1~33 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=95f9b92700585eb9afa6978c350dc07ec5769ec6;p=git.git builtin-apply: minor cleanup of whitespace detection Use 0 instead of -1 for the case where not tabs or spaces are found; it will make some later math slightly simpler. Signed-off-by: J. Bruce Fields Signed-off-by: Junio C Hamano --- diff --git a/builtin-apply.c b/builtin-apply.c index 2edd83bf4..bd94a4bdb 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -1550,8 +1550,8 @@ static int apply_line(char *output, const char *patch, int plen, int i; int add_nl_to_tail = 0; int fixed = 0; - int last_tab_in_indent = -1; - int last_space_in_indent = -1; + int last_tab_in_indent = 0; + int last_space_in_indent = 0; int need_fix_leading_space = 0; char *buf; @@ -1582,12 +1582,12 @@ static int apply_line(char *output, const char *patch, int plen, if (ch == '\t') { last_tab_in_indent = i; if ((ws_rule & WS_SPACE_BEFORE_TAB) && - 0 <= last_space_in_indent) + 0 < last_space_in_indent) need_fix_leading_space = 1; } else if (ch == ' ') { last_space_in_indent = i; if ((ws_rule & WS_INDENT_WITH_NON_TAB) && - last_tab_in_indent < 0 && + last_tab_in_indent <= 0 && 8 <= i) need_fix_leading_space = 1; }