diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-10-20 00:14:42 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-19 13:14:41 -0700 |
| commit | c3a47ca9a78a59e88bb95ffe72fdafb289c0511b (patch) | |
| tree | 46ef7dbd4aca5fd2f9a2575424d62820bf2b8661 | |
| parent | d688cf07b15b664a2164c3d92bcb5e8265400a2b (diff) | |
| download | git-c3a47ca9a78a59e88bb95ffe72fdafb289c0511b.tar.gz | |
tree-walk: use enum interesting instead of integer
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>
| -rw-r--r-- | tree-walk.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tree-walk.c b/tree-walk.c index 4a03e9bd21..6dbd8b0ce8 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -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, const char *match, int matchlen, - int *never_interesting) + enum interesting *never_interesting) { 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 * 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 * returned, allowing the caller to terminate early. */ - *never_interesting = 0; + *never_interesting = entry_not_interesting; } if (pathlen > matchlen) @@ -584,7 +584,7 @@ enum interesting tree_entry_interesting(const struct name_entry *entry, { int i; 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; if (!ps->nr) { |