attr: rename function and struct related to checking attributes

diff --git a/ll-merge.c b/ll-merge.c
index ad8be42f912b456492ca1704ce067fea4713401a..198f07aca16c45024ae4165a538f983eb87c0283 100644 (file)
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -336,13 +336,13 @@ static const struct ll_merge_driver *find_ll_merge_driver(const char *merge_attr
        return &ll_merge_drv[LL_TEXT_MERGE];
 }
 
-static int git_path_check_merge(const char *path, struct git_attr_check check[2])
+static int git_path_check_merge(const char *path, struct attr_check_item check[2])
 {
        if (!check[0].attr) {
                check[0].attr = git_attr("merge");
                check[1].attr = git_attr("conflict-marker-size");
        }
-       return git_check_attr(path, 2, check);
+       return git_check_attrs(path, 2, check);
 }
 
 static void normalize_file(mmfile_t *mm, const char *path)
@@ -362,7 +362,7 @@ int ll_merge(mmbuffer_t *result_buf,
             mmfile_t *theirs, const char *their_label,
             const struct ll_merge_options *opts)
 {
-       static struct git_attr_check check[2];
+       static struct attr_check_item check[2];
        static const struct ll_merge_options default_opts;
        const char *ll_driver_name = NULL;
        int marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
@@ -398,12 +398,12 @@ int ll_merge(mmbuffer_t *result_buf,
 
 int ll_merge_marker_size(const char *path)
 {
-       static struct git_attr_check check;
+       static struct attr_check_item check;
        int marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
 
        if (!check.attr)
                check.attr = git_attr("conflict-marker-size");
-       if (!git_check_attr(path, 1, &check) && check.value) {
+       if (!git_check_attrs(path, 1, &check) && check.value) {
                marker_size = atoi(check.value);
                if (marker_size <= 0)
                        marker_size = DEFAULT_CONFLICT_MARKER_SIZE;