diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/check-ignore.c | 4 | ||||
| -rw-r--r-- | builtin/clean.c | 12 | ||||
| -rw-r--r-- | builtin/ls-files.c | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c index 9a0f234..97108cc 100644 --- a/builtin/check-ignore.c +++ b/builtin/check-ignore.c @@ -41,7 +41,7 @@ static void output_pattern(const char *path, struct path_pattern *pattern) write_name_quoted(path, stdout, '\n'); } else { if (pattern) { - quote_c_style(pattern->el->src, NULL, stdout, 0); + quote_c_style(pattern->pl->src, NULL, stdout, 0); printf(":%d:%s%s%s\t", pattern->srcpos, bang, pattern->pattern, slash); @@ -58,7 +58,7 @@ static void output_pattern(const char *path, struct path_pattern *pattern) } else { if (pattern) printf("%s%c%d%c%s%s%s%c%s%c", - pattern->el->src, '\0', + pattern->pl->src, '\0', pattern->srcpos, '\0', bang, pattern->pattern, slash, '\0', path, '\0'); diff --git a/builtin/clean.c b/builtin/clean.c index aaba4af..d8c847d 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -647,7 +647,7 @@ static int filter_by_patterns_cmd(void) struct strbuf confirm = STRBUF_INIT; struct strbuf **ignore_list; struct string_list_item *item; - struct exclude_list *el; + struct pattern_list *pl; int changed = -1, i; for (;;) { @@ -670,7 +670,7 @@ static int filter_by_patterns_cmd(void) break; memset(&dir, 0, sizeof(dir)); - el = add_exclude_list(&dir, EXC_CMDL, "manual exclude"); + pl = add_exclude_list(&dir, EXC_CMDL, "manual exclude"); ignore_list = strbuf_split_max(&confirm, ' ', 0); for (i = 0; ignore_list[i]; i++) { @@ -678,7 +678,7 @@ static int filter_by_patterns_cmd(void) if (!ignore_list[i]->len) continue; - add_exclude(ignore_list[i]->buf, "", 0, el, -(i+1)); + add_exclude(ignore_list[i]->buf, "", 0, pl, -(i+1)); } changed = 0; @@ -900,7 +900,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) struct pathspec pathspec; struct strbuf buf = STRBUF_INIT; struct string_list exclude_list = STRING_LIST_INIT_NODUP; - struct exclude_list *el; + struct pattern_list *pl; struct string_list_item *item; const char *qname; struct option options[] = { @@ -957,9 +957,9 @@ int cmd_clean(int argc, const char **argv, const char *prefix) if (!ignored) setup_standard_excludes(&dir); - el = add_exclude_list(&dir, EXC_CMDL, "--exclude option"); + pl = add_exclude_list(&dir, EXC_CMDL, "--exclude option"); for (i = 0; i < exclude_list.nr; i++) - add_exclude(exclude_list.items[i].string, "", 0, el, -(i+1)); + add_exclude(exclude_list.items[i].string, "", 0, pl, -(i+1)); parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD, diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 7f83c9a..df8918a 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -516,7 +516,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) int require_work_tree = 0, show_tag = 0, i; const char *max_prefix; struct dir_struct dir; - struct exclude_list *el; + struct pattern_list *pl; struct string_list exclude_list = STRING_LIST_INIT_NODUP; struct option builtin_ls_files_options[] = { /* Think twice before adding "--nul" synonym to this */ @@ -594,9 +594,9 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) argc = parse_options(argc, argv, prefix, builtin_ls_files_options, ls_files_usage, 0); - el = add_exclude_list(&dir, EXC_CMDL, "--exclude option"); + pl = add_exclude_list(&dir, EXC_CMDL, "--exclude option"); for (i = 0; i < exclude_list.nr; i++) { - add_exclude(exclude_list.items[i].string, "", 0, el, --exclude_args); + add_exclude(exclude_list.items[i].string, "", 0, pl, --exclude_args); } if (show_tag || show_valid_bit || show_fsmonitor_bit) { tag_cached = "H "; |