From: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
Change the ls-tree.c code to use type_name() on the enum instead of
using the string constants. This doesn't matter either way for
performance, but makes this a bit easier to read as we'll no longer
need a strcmp() here.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
---
builtin/ls-tree.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index 0a28f32ccb..3f0225b097 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -66,17 +66,17 @@ static int show_tree(const struct object_id *oid, struct strbuf *base,
{
int retval = 0;
int baselen;
- const char *type = blob_type;
+ enum object_type type = OBJ_BLOB;
if (S_ISGITLINK(mode)) {
- type = commit_type;
+ 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 = tree_type;
+ type = OBJ_TREE;
}
else if (ls_options & LS_TREE_ONLY)
return 0;
@@ -84,7 +84,7 @@ static int show_tree(const struct object_id *oid, struct strbuf *base,
if (!(ls_options & LS_NAME_ONLY)) {
if (ls_options & LS_SHOW_SIZE) {
char size_text[24];
- if (!strcmp(type, blob_type)) {
+ if (type == OBJ_BLOB) {
unsigned long size;
if (oid_object_info(the_repository, oid, &size) == OBJ_BAD)
xsnprintf(size_text, sizeof(size_text),
@@ -95,11 +95,11 @@ static int show_tree(const struct object_id *oid, struct strbuf *base,
} else {
xsnprintf(size_text, sizeof(size_text), "-");
}
- printf("%06o %s %s %7s\t", mode, type,
+ printf("%06o %s %s %7s\t", mode, type_name(type),
find_unique_abbrev(oid, abbrev),
size_text);
} else {
- printf("%06o %s %s\t", mode, type,
+ printf("%06o %s %s\t", mode, type_name(type),
find_unique_abbrev(oid, abbrev));
}
}
--
2.34.1.404.g92931a4a2c.dirty
