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

Merge branch 'sb/traverse-trees-bitmask-variable-name'

Browse Source 
* sb/traverse-trees-bitmask-variable-name:
  traverse_trees(): clarify return value of the callback
This commit is contained in:
Junio C Hamano 2013-07-24 19:21:25 -07:00
commit cb1824657b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tree-walk.c
View File

@ -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 traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
{ {
int ret = 0;
int error = 0; int error = 0;
struct name_entry *entry = xmalloc(n*sizeof(*entry)); struct name_entry *entry = xmalloc(n*sizeof(*entry));
int i; int i;
@ -341,6 +340,7 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
strbuf_setlen(&base, info->pathlen); strbuf_setlen(&base, info->pathlen);
} }
for (;;) { for (;;) {
int trees_used;
unsigned long mask, dirmask; unsigned long mask, dirmask;
const char *first = NULL; const char *first = NULL;
int first_len = 0; int first_len = 0;
@ -404,15 +404,14 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
if (interesting < 0) if (interesting < 0)
break; break;
if (interesting) { if (interesting) {
ret = info->fn(n, mask, dirmask, entry, info); trees_used = info->fn(n, mask, dirmask, entry, info);
if (ret < 0) { if (trees_used < 0) {
error = ret; error = trees_used;
if (!info->show_all_errors) if (!info->show_all_errors)
break; break;
} }
mask &= ret; mask &= trees_used;
} }
ret = 0;
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
if (mask & (1ul << i)) if (mask & (1ul << i))
update_extended_entry(tx + i, entry + i); update_extended_entry(tx + i, entry + i);