kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Adam Spiers 2012-12-27 02:32:24 +00:00 committed by Junio C Hamano
parent 9013089c4a
commit 0795805053
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dir.c
View File

@ -605,9 +605,9 @@ int match_pathname(const char *pathname, int pathlen,
/* Scan the list and let the last match determine the fate. /* Scan the list and let the last match determine the fate.
* Return 1 for exclude, 0 for include and -1 for undecided. * 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, int pathlen, const char *basename, int *dtype,
struct exclude_list *el) struct exclude_list *el)
{ {
int i; int i;


@ -654,8 +654,9 @@ static int excluded(struct dir_struct *dir, const char *pathname, int *dtype_p)


prep_exclude(dir, pathname, basename-pathname); prep_exclude(dir, pathname, basename-pathname);
for (st = EXC_CMDL; st <= EXC_FILE; st++) { for (st = EXC_CMDL; st <= EXC_FILE; st++) {
switch (excluded_from_list(pathname, pathlen, basename, switch (is_excluded_from_list(pathname, pathlen,
dtype_p, &dir->exclude_list[st])) { basename, dtype_p,
&dir->exclude_list[st])) {
case 0: case 0:
return 0; return 0;
case 1: case 1:

4
dir.h
View File

@ -98,8 +98,8 @@ 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 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 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); int *dtype, struct exclude_list *el);
struct dir_entry *dir_add_ignored(struct dir_struct *dir, const char *pathname, int len); struct dir_entry *dir_add_ignored(struct dir_struct *dir, const char *pathname, int len);


/* /*

8
unpack-trees.c
View File

@ -836,7 +836,8 @@ static int clear_ce_flags_dir(struct cache_entry **cache, int nr,
{ {
struct cache_entry **cache_end; struct cache_entry **cache_end;
int dtype = DT_DIR; 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++] = '/'; 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 * with ret (iow, we know in advance the incl/excl
* decision for the entire directory), clear flag here without * decision for the entire directory), clear flag here without
* calling clear_ce_flags_1(). That function will call * 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, return clear_ce_flags_1(cache, cache_end - cache,
prefix, prefix_len, prefix, prefix_len,
@ -938,7 +939,8 @@ static int clear_ce_flags_1(struct cache_entry **cache, int nr,


/* Non-directory */ /* Non-directory */
dtype = ce_to_dtype(ce); 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) if (ret < 0)
ret = defval; ret = defval;
if (ret > 0) if (ret > 0)