tree-walk: rename "error" variable
The "error" variable in traverse_trees() shadows the global error() function (meaning we can't call error() from here). Let's call the local variable "ret" instead, which matches the idiom in other functions. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Aug 31, 2023 at 02:19 UTC
c7cd0e34cd5f62339d4c92e96d2e7dd848dd5a6c
1 file changed
+3
-3
tree-walk.c
+3
-3
@@ -441,7 +441,7 @@ int traverse_trees(struct index_state *istate,
441
int n, struct tree_desc *t,
442
struct traverse_info *info)
443
{
444
- int error = 0;
444
+ int ret = 0;
445
struct name_entry *entry;
446
int i;
447
struct tree_desc_x *tx;
@@ -539,7 +539,7 @@ int traverse_trees(struct index_state *istate,
539
if (interesting) {
540
trees_used = info->fn(n, mask, dirmask, entry, info);
541
if (trees_used < 0) {
542
- error = trees_used;
542
+ ret = trees_used;
543
if (!info->show_all_errors)
544
break;
545
}
@@ -558,7 +558,7 @@ int traverse_trees(struct index_state *istate,
558
strbuf_release(&base);
559
560
traverse_trees_cur_depth--;
561
- return error;
561
+ return ret;
562
}
563
564
struct dir_state {