summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Beller <stefanbeller@googlemail.com>2013-07-19 22:26:32 +0200
committerJunio C Hamano <gitster@pobox.com>2013-07-19 15:29:41 -0700
commita04f8196a8f067b6c36415a0d934a46465140c34 (patch)
treebed9b67e0f25f0ec46d12cf52dd6ff451043f902
parentedca4152560522a431a51fc0a06147fc680b5b18 (diff)
downloadgit-a04f8196a8f067b6c36415a0d934a46465140c34.tar.gz
traverse_trees(): clarify return value of the callbacksb/traverse-trees-bitmask-variable-name
The variable name "ret" sounds like the variable to be returned, but since e6c111b4 we return error, and it is misleading. As this variable tells us which trees in t[] array were used in the callback function, so that this caller can know the entries in which of the trees need advancing, "trees_used" is a better name. Also the assignment to 0 was removed at the start of the function as well after the "if (interesting)" block. Those are unneeded as that variable is set to the callback return value any time we enter the "if (interesting)" block, so we'd overwrite old values anyway. Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--tree-walk.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/tree-walk.c b/tree-walk.c
index 6e30ef9d04..c626135234 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -323,7 +323,6 @@ static inline int prune_traversal(struct name_entry *e,
int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
{
- int ret = 0;
int error = 0;
struct name_entry *entry = xmalloc(n*sizeof(*entry));
int i;
@@ -341,6 +340,7 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
strbuf_setlen(&base, info->pathlen);
}
for (;;) {
+ int trees_used;
unsigned long mask, dirmask;
const char *first = NULL;
int first_len = 0;
@@ -404,15 +404,14 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
if (interesting < 0)
break;
if (interesting) {
- ret = info->fn(n, mask, dirmask, entry, info);
- if (ret < 0) {
- error = ret;
+ trees_used = info->fn(n, mask, dirmask, entry, info);
+ if (trees_used < 0) {
+ error = trees_used;
if (!info->show_all_errors)
break;
}
- mask &= ret;
+ mask &= trees_used;
}
- ret = 0;
for (i = 0; i < n; i++)
if (mask & (1ul << i))
update_extended_entry(tx + i, entry + i);