[BONUS][PATCH] ls-tree: remove dead store and strbuf for quote_c_style()
From: René Scharfe <hidden>
Date: 2023-01-14 15:03:27
Subsystem:
the rest · Maintainer:
Linus Torvalds
Stop initializing "name" because it is set again before use. Let quote_c_style() write directly to "sb" instead of taking a detour through "quoted". This avoids an allocation and a string copy. The result is the same because the function only appends. Signed-off-by: René Scharfe <redacted> --- builtin/ls-tree.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index 120fff9fa0..9b804cd13b 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c@@ -94,18 +94,15 @@ static size_t expand_show_tree(struct strbuf *sb, const char *start, } else if (skip_prefix(start, "(objectname)", &p)) { strbuf_add_unique_abbrev(sb, data->oid, abbrev); } else if (skip_prefix(start, "(path)", &p)) { - const char *name = data->base->buf; + const char *name; const char *prefix = chomp_prefix ? ls_tree_prefix : NULL; - struct strbuf quoted = STRBUF_INIT; struct strbuf sbuf = STRBUF_INIT; size_t baselen = data->base->len; strbuf_addstr(data->base, data->pathname); name = relative_path(data->base->buf, prefix, &sbuf); - quote_c_style(name, "ed, NULL, 0); + quote_c_style(name, sb, NULL, 0); strbuf_setlen(data->base, baselen); - strbuf_addbuf(sb, "ed); strbuf_release(&sbuf); - strbuf_release("ed); } else { errlen = (unsigned long)len; die(_("bad ls-tree format: %%%.*s"), errlen, start); --
2.39.0