whitespace: reorganize initial-indent check

Reorganize to emphasize the most complicated part of the code (the tab
case).

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/ws.c b/ws.c
index 5ebd1095a2af1dfc75bf79250bb775ac39580a2e..716587498c14843aef1476a9c6b11e403466f992 100644 (file)
--- a/ws.c
+++ b/ws.c
@@ -146,16 +146,15 @@ unsigned check_and_emit_line(const char *line, int len, unsigned ws_rule,
 
        /* Check for space before tab in initial indent. */
        for (i = 0; i < len; i++) {
 
        /* Check for space before tab in initial indent. */
        for (i = 0; i < len; i++) {

-               if (line[i] == '\t') {
-                       if ((ws_rule & WS_SPACE_BEFORE_TAB) &&
-                           (leading_space != -1))
-                               result |= WS_SPACE_BEFORE_TAB;
-                       break;
-               }
-               else if (line[i] == ' ')
+               if (line[i] == ' ') {

                        leading_space = i;
                        leading_space = i;

-               else
+                       continue;
+               }
+               if (line[i] != '\t')

                        break;
                        break;

+               if ((ws_rule & WS_SPACE_BEFORE_TAB) && (leading_space != -1))
+                       result |= WS_SPACE_BEFORE_TAB;
+               break;

        }
 
        /* Check for indent using non-tab. */
        }
 
        /* Check for indent using non-tab. */