зеркало из https://github.com/microsoft/git.git
dir.c: rename excluded_from_list() to is_excluded_from_list()
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 Also adjust their callers as necessary. Signed-off-by: Adam Spiers <git@adamspiers.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
9013089c4a
Коммит
0795805053
7
dir.c
7
dir.c
|
@ -605,7 +605,7 @@ int match_pathname(const char *pathname, int pathlen,
|
|||
/* Scan the list and let the last match determine the fate.
|
||||
* Return 1 for exclude, 0 for include and -1 for undecided.
|
||||
*/
|
||||
int excluded_from_list(const char *pathname,
|
||||
int is_excluded_from_list(const char *pathname,
|
||||
int pathlen, const char *basename, int *dtype,
|
||||
struct exclude_list *el)
|
||||
{
|
||||
|
@ -654,8 +654,9 @@ static int excluded(struct dir_struct *dir, const char *pathname, int *dtype_p)
|
|||
|
||||
prep_exclude(dir, pathname, basename-pathname);
|
||||
for (st = EXC_CMDL; st <= EXC_FILE; st++) {
|
||||
switch (excluded_from_list(pathname, pathlen, basename,
|
||||
dtype_p, &dir->exclude_list[st])) {
|
||||
switch (is_excluded_from_list(pathname, pathlen,
|
||||
basename, dtype_p,
|
||||
&dir->exclude_list[st])) {
|
||||
case 0:
|
||||
return 0;
|
||||
case 1:
|
||||
|
|
2
dir.h
2
dir.h
|
@ -98,7 +98,7 @@ extern int within_depth(const char *name, int namelen, int depth, int max_depth)
|
|||
extern int fill_directory(struct dir_struct *dir, const char **pathspec);
|
||||
extern int read_directory(struct dir_struct *, const char *path, int len, const char **pathspec);
|
||||
|
||||
extern int excluded_from_list(const char *pathname, int pathlen, const char *basename,
|
||||
extern int is_excluded_from_list(const char *pathname, int pathlen, const char *basename,
|
||||
int *dtype, struct exclude_list *el);
|
||||
struct dir_entry *dir_add_ignored(struct dir_struct *dir, const char *pathname, int len);
|
||||
|
||||
|
|
|
@ -836,7 +836,8 @@ static int clear_ce_flags_dir(struct cache_entry **cache, int nr,
|
|||
{
|
||||
struct cache_entry **cache_end;
|
||||
int dtype = DT_DIR;
|
||||
int ret = excluded_from_list(prefix, prefix_len, basename, &dtype, el);
|
||||
int ret = is_excluded_from_list(prefix, prefix_len,
|
||||
basename, &dtype, el);
|
||||
|
||||
prefix[prefix_len++] = '/';
|
||||
|
||||
|
@ -855,7 +856,7 @@ static int clear_ce_flags_dir(struct cache_entry **cache, int nr,
|
|||
* with ret (iow, we know in advance the incl/excl
|
||||
* decision for the entire directory), clear flag here without
|
||||
* calling clear_ce_flags_1(). That function will call
|
||||
* the expensive excluded_from_list() on every entry.
|
||||
* the expensive is_excluded_from_list() on every entry.
|
||||
*/
|
||||
return clear_ce_flags_1(cache, cache_end - cache,
|
||||
prefix, prefix_len,
|
||||
|
@ -938,7 +939,8 @@ static int clear_ce_flags_1(struct cache_entry **cache, int nr,
|
|||
|
||||
/* Non-directory */
|
||||
dtype = ce_to_dtype(ce);
|
||||
ret = excluded_from_list(ce->name, ce_namelen(ce), name, &dtype, el);
|
||||
ret = is_excluded_from_list(ce->name, ce_namelen(ce),
|
||||
name, &dtype, el);
|
||||
if (ret < 0)
|
||||
ret = defval;
|
||||
if (ret > 0)
|
||||
|
|
Загрузка…
Ссылка в новой задаче