revision.c: remove implicit dependency on the_index

diff --git a/ws.c b/ws.c
index b498d7599d5ac09c2688ee829b29aa36a866ac9c..55349b4c5d08597e38ab76d10cd0d11b944f4f37 100644 (file)
--- a/ws.c
+++ b/ws.c
@@ -3,7 +3,6 @@
  *
  * Copyright (c) 2007 Junio C Hamano
  */
-
 #include "cache.h"
 #include "attr.h"
 
@@ -33,11 +32,8 @@ unsigned parse_whitespace_rule(const char *string)
                int negated = 0;
 
                string = string + strspn(string, ", \t\n\r");
-               ep = strchr(string, ',');
-               if (!ep)
-                       len = strlen(string);
-               else
-                       len = ep - string;
+               ep = strchrnul(string, ',');
+               len = ep - string;
 
                if (*string == '-') {
                        negated = 1;
@@ -74,24 +70,17 @@ unsigned parse_whitespace_rule(const char *string)
        return rule;
 }
 
-static void setup_whitespace_attr_check(struct git_attr_check *check)
+unsigned whitespace_rule(struct index_state *istate, const char *pathname)
 {
-       static struct git_attr *attr_whitespace;
-
-       if (!attr_whitespace)
-               attr_whitespace = git_attr("whitespace");
-       check[0].attr = attr_whitespace;
-}
+       static struct attr_check *attr_whitespace_rule;
 
-unsigned whitespace_rule(const char *pathname)
-{
-       struct git_attr_check attr_whitespace_rule;
+       if (!attr_whitespace_rule)
+               attr_whitespace_rule = attr_check_initl("whitespace", NULL);
 
-       setup_whitespace_attr_check(&attr_whitespace_rule);
-       if (!git_check_attr(pathname, 1, &attr_whitespace_rule)) {
+       if (!git_check_attr(istate, pathname, attr_whitespace_rule)) {
                const char *value;
 
-               value = attr_whitespace_rule.value;
+               value = attr_whitespace_rule->items[0].value;
                if (ATTR_TRUE(value)) {
                        /* true (whitespace) */
                        unsigned all_rule = ws_tab_width(whitespace_rule_cfg);