The variable which "show_tree()" return is named "retval", a name that's
a little hard to understand. This commit tries to make the variable
and the related codes more clear in the context.
The change is based on three steps. The first is to rename "retval" to
a more meaningful name.
The second is that there are different "return" cases in "show_tree",
some places use "return retval;", some just directly use "return 0;",
this maybe cause some confusion when reading these "returns". For this
, we change all the "return" cases to the new uniform name.
The last is there are some nested "if" judgments surround the "returns",
this even make the codes here a little hard to understand. So we put
some logic in individual methods, "init_type()" and "init_recursive()".
After the steps, let us look at "show_tree()" again. It has a uniform
return variable name now, and first we init the "type" by "mode", then
call "init_recursive" to init the value of "recursive" which means
whether to go on reading recusively into the "tree". The codes here
become a little bit clearer, so we do not need to take a look at
"read_tree_at()" in "tree.c" to make sure the context of the return
value.
Signed-off-by: Teng Long <dyronetengb@xxxxxxxxx>
---
builtin/ls-tree.c | 38 ++++++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index eecc7482d5..7383dddf8c 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -61,25 +61,35 @@ static int show_recursive(const char *base, size_t baselen, const char *pathname
return 0;
}
+static void init_type(unsigned mode, enum object_type *type)
+{
+ if (S_ISGITLINK(mode))
+ *type = OBJ_COMMIT;
+ else if (S_ISDIR(mode))
+ *type = OBJ_TREE;
+}
+
+static void init_recursive(struct strbuf *base, const char *pathname,
+ int *recursive)
+{
+ if (show_recursive(base->buf, base->len, pathname))
+ *recursive = READ_TREE_RECURSIVE;
+}
+
static int show_tree(const struct object_id *oid, struct strbuf *base,
const char *pathname, unsigned mode, void *context)
{
- int retval = 0;
+ int recursive = 0;
size_t baselen;
enum object_type type = OBJ_BLOB;
- if (S_ISGITLINK(mode)) {
- type = OBJ_COMMIT;
- } else if (S_ISDIR(mode)) {
- if (show_recursive(base->buf, base->len, pathname)) {
- retval = READ_TREE_RECURSIVE;
- if (!(ls_options & LS_SHOW_TREES))
- return retval;
- }
- type = OBJ_TREE;
- }
- else if (ls_options & LS_TREE_ONLY)
- return 0;
+ init_type(mode, &type);
+ init_recursive(base, pathname, &recursive);
+
+ if (type == OBJ_TREE && recursive && !(ls_options & LS_SHOW_TREES))
+ return recursive;
+ if (type == OBJ_BLOB && (ls_options & LS_TREE_ONLY))
+ return !READ_TREE_RECURSIVE;
if (!(ls_options & LS_NAME_ONLY)) {
if (ls_options & LS_SHOW_SIZE) {
@@ -109,7 +119,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 recursive;
}
int cmd_ls_tree(int argc, const char **argv, const char *prefix)
--
2.33.0.rc1.1794.g2ae0a9cb82
