general improvements

diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c
index 97108ccb9ce2a3391737d723384ed8b89f7036bc..5a4f92395f371438cbfc0582c77666622b9c0b3d 100644 (file)
--- a/builtin/check-ignore.c
+++ b/builtin/check-ignore.c
@@ -34,8 +34,8 @@ static const struct option check_ignore_options[] = {
 
 static void output_pattern(const char *path, struct path_pattern *pattern)
 {
-       char *bang  = (pattern && pattern->flags & EXC_FLAG_NEGATIVE)  ? "!" : "";
-       char *slash = (pattern && pattern->flags & EXC_FLAG_MUSTBEDIR) ? "/" : "";
+       char *bang  = (pattern && pattern->flags & PATTERN_FLAG_NEGATIVE)  ? "!" : "";
+       char *slash = (pattern && pattern->flags & PATTERN_FLAG_MUSTBEDIR) ? "/" : "";
        if (!nul_term_line) {
                if (!verbose) {
                        write_name_quoted(path, stdout, '\n');
@@ -106,7 +106,7 @@ static int check_ignore(struct dir_struct *dir,
                pattern = NULL;
                if (!seen[i]) {
                        int dtype = DT_UNKNOWN;
-                       pattern = last_exclude_matching(dir, &the_index,
+                       pattern = last_matching_pattern(dir, &the_index,
                                                        full_path, &dtype);
                }
                if (!quiet && (pattern || show_non_matching))