undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dir.c: rename excluded() to is_excluded()

Browse Source 
Continue adopting clearer names for exclude functions.  This is_*
naming pattern for functions returning booleans was discussed here:

http://thread.gmane.org/gmane.comp.version-control.git/204661/focus=204924

Signed-off-by: Adam Spiers <git@adamspiers.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Adam Spiers 2012-12-27 02:32:25 +00:00 committed by Junio C Hamano
parent 0795805053
commit 6d24e7a807
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
attr.c
View File

@ -284,7 +284,7 @@ static struct match_attr *parse_attr_line(const char *line, const char *src,
* (reading the file from top to bottom), .gitattribute of the root * (reading the file from top to bottom), .gitattribute of the root
* directory (again, reading the file from top to bottom) down to the * directory (again, reading the file from top to bottom) down to the
* current directory, and then scan the list backwards to find the first match. * current directory, and then scan the list backwards to find the first match.
* This is exactly the same as what excluded() does in dir.c to deal with * This is exactly the same as what is_excluded() does in dir.c to deal with
* .gitignore * .gitignore
*/ */

10
dir.c
View File

@ -645,7 +645,7 @@ int is_excluded_from_list(const char *pathname,
return -1; /* undecided */ return -1; /* undecided */
} }
static int excluded(struct dir_struct *dir, const char *pathname, int *dtype_p) static int is_excluded(struct dir_struct *dir, const char *pathname, int *dtype_p)
{ {
int pathlen = strlen(pathname); int pathlen = strlen(pathname);
int st; int st;
@ -695,7 +695,7 @@ int is_path_excluded(struct path_exclude_check *check,
/* /*
* we allow the caller to pass namelen as an optimization; it * we allow the caller to pass namelen as an optimization; it
* must match the length of the name, as we eventually call * must match the length of the name, as we eventually call
* excluded() on the whole name string. * is_excluded() on the whole name string.
*/ */
if (namelen < 0) if (namelen < 0)
namelen = strlen(name); namelen = strlen(name);
@ -712,7 +712,7 @@ int is_path_excluded(struct path_exclude_check *check,
if (ch == '/') { if (ch == '/') {
int dt = DT_DIR; int dt = DT_DIR;
if (excluded(check->dir, path->buf, &dt)) if (is_excluded(check->dir, path->buf, &dt))
return 1; return 1;
} }
strbuf_addch(path, ch); strbuf_addch(path, ch);
@ -721,7 +721,7 @@ int is_path_excluded(struct path_exclude_check *check,
/* An entry in the index; cannot be a directory with subentries */ /* An entry in the index; cannot be a directory with subentries */
strbuf_setlen(path, 0); strbuf_setlen(path, 0);
return excluded(check->dir, name, dtype); return is_excluded(check->dir, name, dtype);
} }
static struct dir_entry *dir_entry_new(const char *pathname, int len) static struct dir_entry *dir_entry_new(const char *pathname, int len)
@ -1021,7 +1021,7 @@ static enum path_treatment treat_one_path(struct dir_struct *dir,
const struct path_simplify *simplify, const struct path_simplify *simplify,
int dtype, struct dirent *de) int dtype, struct dirent *de)
{ {
int exclude = excluded(dir, path->buf, &dtype); int exclude = is_excluded(dir, path->buf, &dtype);
if (exclude && (dir->flags & DIR_COLLECT_IGNORED) if (exclude && (dir->flags & DIR_COLLECT_IGNORED)
&& exclude_matches_pathspec(path->buf, path->len, simplify)) && exclude_matches_pathspec(path->buf, path->len, simplify))
dir_add_ignored(dir, path->buf, path->len); dir_add_ignored(dir, path->buf, path->len);

4
dir.h
View File

@ -113,8 +113,8 @@ extern int match_pathname(const char *, int,
const char *, int, int, int); const char *, int, int, int);
/* /*
* The excluded() API is meant for callers that check each level of leading * The is_excluded() API is meant for callers that check each level of leading
* directory hierarchies with excluded() to avoid recursing into excluded * directory hierarchies with is_excluded() to avoid recursing into excluded
* directories. Callers that do not do so should use this API instead. * directories. Callers that do not do so should use this API instead.
*/ */
struct path_exclude_check { struct path_exclude_check {