@@ -64,7 +64,7 @@ static int show_recursive(const char *base, size_t baselen, const char *pathname
static int show_tree(const struct object_id *oid, struct strbuf *base,
const char *pathname, unsigned mode, void *context)
{
- int retval = 0;
+ int recurse = 0;
size_t baselen;
enum object_type type = OBJ_BLOB;
@@ -72,9 +72,9 @@ static int show_tree(const struct object_id *oid, struct strbuf *base,
type = OBJ_COMMIT;
} else if (S_ISDIR(mode)) {
if (show_recursive(base->buf, base->len, pathname)) {
- retval = READ_TREE_RECURSIVE;
+ recurse = READ_TREE_RECURSIVE;
if (!(ls_options & LS_SHOW_TREES))
- return retval;
+ return recurse;
}
type = OBJ_TREE;
}
@@ -109,7 +109,7 @@ static int show_tree(const struct object_id *oid, struct strbuf *base,
chomp_prefix ? ls_tree_prefix : NULL,
stdout, line_termination);
strbuf_setlen(base, baselen);
- return retval;
+ return recurse;
}
int cmd_ls_tree(int argc, const char **argv, const char *prefix)
The variable which "show_tree()" return is named "retval", a name that's a little hard to understand. The commit rename "retval" to "recurse" which is a more meaningful name than before in the context. We do not need to take a look at "read_tree_at()" in "tree.c" to make sure what does "retval" mean. Signed-off-by: Teng Long <dyroneteng@gmail.com> --- builtin/ls-tree.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)