diff options
| author | Adam Spiers <git@adamspiers.org> | 2012-12-27 02:32:24 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-28 12:07:46 -0800 |
| commit | 0795805053ad89a24954684fca2e69fea2bf50b9 (patch) | |
| tree | f95882b9c7be6e489371b7fef151d811be07d5e1 /unpack-trees.c | |
| parent | 9013089c4a841bf17bcc8e2510a86ceecac29ffd (diff) | |
| download | git-0795805053ad89a24954684fca2e69fea2bf50b9.tar.gz | |
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>
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 3ac6370f99..c0da094285 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -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) |