From: Michael Haggerty Date: Thu, 04 Aug 2011 04:36:20 GMT Subject: [PATCH v3 10/23] Extract a function collect_all_attrs() Message-ID: <1312432593-9841-11-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1312432593-9841-1-git-send-email-mhagger@alum.mit.edu> Signed-off-by: Michael Haggerty --- attr.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/attr.c b/attr.c index 7f0f390..bc589f0 100644 --- a/attr.c +++ b/attr.c @@ -713,20 +713,31 @@ static int macroexpand_one(int attr_nr, int rem) return rem; } -int git_checkattr(const char *path, int num, struct git_attr_check *check) +/* + * Collect all attributes for path into the array pointed to by + * check_all_attr. + */ +static void collect_all_attrs(const char *path) { struct attr_stack *stk; - int pathlen, i, rem; + int i, pathlen, rem; bootstrap_attr_stack(); + prepare_attr_stack(path); for (i = 0; i < attr_nr; i++) check_all_attr[i].value = ATTR__UNKNOWN; pathlen = strlen(path); - prepare_attr_stack(path); rem = attr_nr; for (stk = attr_stack; 0 < rem && stk; stk = stk->prev) rem = fill(path, pathlen, stk, rem); +} + +int git_checkattr(const char *path, int num, struct git_attr_check *check) +{ + int i; + + collect_all_attrs(path); for (i = 0; i < num; i++) { const char *value = check_all_attr[check[i].attr->attr_nr].value; -- 1.7.6.8.gd2879