diff options
Diffstat (limited to 'attr.c')
| -rw-r--r-- | attr.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -56,7 +56,7 @@ static struct git_attr *(git_attr_hash[HASHSIZE]); static int cannot_trust_maybe_real; /* NEEDSWORK: This will become per git_attr_check */ -static struct git_attr_check *check_all_attr; +static struct attr_check_item *check_all_attr; const char *git_attr_name(const struct git_attr *attr) { @@ -713,7 +713,7 @@ static int macroexpand_one(int attr_nr, int rem); static int fill_one(const char *what, struct match_attr *a, int rem) { - struct git_attr_check *check = check_all_attr; + struct attr_check_item *check = check_all_attr; int i; for (i = a->num_attr - 1; 0 < rem && 0 <= i; i--) { @@ -778,7 +778,7 @@ static int macroexpand_one(int nr, int rem) * collected. Otherwise all attributes are collected. */ static void collect_some_attrs(const char *path, int num, - struct git_attr_check *check) + struct attr_check_item *check) { struct attr_stack *stk; @@ -806,7 +806,7 @@ static void collect_some_attrs(const char *path, int num, rem = 0; for (i = 0; i < num; i++) { if (!check[i].attr->maybe_real) { - struct git_attr_check *c; + struct attr_check_item *c; c = check_all_attr + check[i].attr->attr_nr; c->value = ATTR__UNSET; rem++; @@ -821,7 +821,7 @@ static void collect_some_attrs(const char *path, int num, rem = fill(path, pathlen, basename_offset, stk, rem); } -int git_check_attr(const char *path, int num, struct git_attr_check *check) +int git_check_attrs(const char *path, int num, struct attr_check_item *check) { int i; @@ -837,7 +837,7 @@ int git_check_attr(const char *path, int num, struct git_attr_check *check) return 0; } -int git_all_attrs(const char *path, int *num, struct git_attr_check **check) +int git_all_attrs(const char *path, int *num, struct attr_check_item **check) { int i, count, j; |