From: J. Bruce Fields Date: Sun, 16 Dec 2007 17:58:01 GMT Subject: [PATCH 1/2] builtin-apply: minor cleanup of whitespace detection Message-ID: <1197827882-11710-2-git-send-email-bfields@citi.umich.edu> In-Reply-To: <1197827882-11710-1-git-send-email-bfields@citi.umich.edu> 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 --- builtin-apply.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin-apply.c b/builtin-apply.c index 2edd83b..bd94a4b 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; } -- 1.5.4.rc0.44.g21147