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

tree-walk: use enum interesting instead of integer

Browse Source 
Commit d688cf0 (tree_entry_interesting(): give meaningful names to
return values - 2011-10-24) converts most of the tree_entry_interesting
values to the new enum, except "never_interesting". This completes the
conversion.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2012-10-20 00:14:42 +07:00 committed by Junio C Hamano
parent d688cf07b1
commit c3a47ca9a7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tree-walk.c
View File

@ -490,11 +490,11 @@ int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned ch
static int match_entry(const struct name_entry *entry, int pathlen, static int match_entry(const struct name_entry *entry, int pathlen,
const char *match, int matchlen, const char *match, int matchlen,
int *never_interesting) enum interesting *never_interesting)
{ {
int m = -1; /* signals that we haven't called strncmp() */ int m = -1; /* signals that we haven't called strncmp() */
if (*never_interesting) { if (*never_interesting != entry_not_interesting) {
/* /*
* We have not seen any match that sorts later * We have not seen any match that sorts later
* than the current path. * than the current path.
@ -522,7 +522,7 @@ static int match_entry(const struct name_entry *entry, int pathlen,
* the variable to -1 and that is what will be * the variable to -1 and that is what will be
* returned, allowing the caller to terminate early. * returned, allowing the caller to terminate early.
*/ */
*never_interesting = 0; *never_interesting = entry_not_interesting;
} }
if (pathlen > matchlen) if (pathlen > matchlen)
@ -584,7 +584,7 @@ enum interesting tree_entry_interesting(const struct name_entry *entry,
{ {
int i; int i;
int pathlen, baselen = base->len - base_offset; int pathlen, baselen = base->len - base_offset;
int never_interesting = ps->has_wildcard ? enum interesting never_interesting = ps->has_wildcard ?
entry_not_interesting : all_entries_not_interesting; entry_not_interesting : all_entries_not_interesting;
if (!ps->nr) { if (!ps->nr) {