diff options
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/check-attr.c | 19 | ||||
-rw-r--r-- | builtin/pack-objects.c | 6 |
2 files changed, 13 insertions, 12 deletions
diff --git a/builtin/check-attr.c b/builtin/check-attr.c index 53a5a18c16..889264a5be 100644 --- a/builtin/check-attr.c +++ b/builtin/check-attr.c @@ -24,8 +24,8 @@ static const struct option check_attr_options[] = { OPT_END() }; -static void output_attr(int cnt, struct git_attr_check *check, - const char *file) +static void output_attr(int cnt, struct attr_check_item *check, + const char *file) { int j; for (j = 0; j < cnt; j++) { @@ -51,14 +51,15 @@ static void output_attr(int cnt, struct git_attr_check *check, } } -static void check_attr(const char *prefix, int cnt, - struct git_attr_check *check, const char *file) +static void check_attr(const char *prefix, + int cnt, struct attr_check_item *check, + const char *file) { char *full_path = prefix_path(prefix, prefix ? strlen(prefix) : 0, file); if (check != NULL) { - if (git_check_attr(full_path, cnt, check)) - die("git_check_attr died"); + if (git_check_attrs(full_path, cnt, check)) + die("git_check_attrs died"); output_attr(cnt, check, file); } else { if (git_all_attrs(full_path, &cnt, &check)) @@ -69,8 +70,8 @@ static void check_attr(const char *prefix, int cnt, free(full_path); } -static void check_attr_stdin_paths(const char *prefix, int cnt, - struct git_attr_check *check) +static void check_attr_stdin_paths(const char *prefix, + int cnt, struct attr_check_item *check) { struct strbuf buf = STRBUF_INIT; struct strbuf unquoted = STRBUF_INIT; @@ -99,7 +100,7 @@ static NORETURN void error_with_usage(const char *msg) int cmd_check_attr(int argc, const char **argv, const char *prefix) { - struct git_attr_check *check; + struct attr_check_item *check; int cnt, i, doubledash, filei; if (!is_bare_repository()) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 8841f8b366..8b8fbd814b 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -894,7 +894,7 @@ static void write_pack_file(void) written, nr_result); } -static void setup_delta_attr_check(struct git_attr_check *check) +static void setup_delta_attr_check(struct attr_check_item *check) { static struct git_attr *attr_delta; @@ -906,10 +906,10 @@ static void setup_delta_attr_check(struct git_attr_check *check) static int no_try_delta(const char *path) { - struct git_attr_check check[1]; + struct attr_check_item check[1]; setup_delta_attr_check(check); - if (git_check_attr(path, ARRAY_SIZE(check), check)) + if (git_check_attrs(path, ARRAY_SIZE(check), check)) return 0; if (ATTR_FALSE(check->value)) return 1; |