From b3b3cbcbf246b1051ad453bc02e24a89573e2911 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 31 Jul 2019 00:38:20 -0400 Subject: tree-walk: accept a raw length for traverse_path_len() We take a "struct name_entry", but only care about the length of the path name. Let's just take that length directly, making it easier to use the function from callers that sometimes do not have a name_entry at all. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- builtin/merge-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin/merge-tree.c') diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index f0e4cfefaa..0629c87b19 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -180,7 +180,7 @@ static struct merge_list *create_entry(unsigned stage, unsigned mode, const stru static char *traverse_path(const struct traverse_info *info, const struct name_entry *n) { - char *path = xmallocz(traverse_path_len(info, n)); + char *path = xmallocz(traverse_path_len(info, tree_entry_len(n))); return make_traverse_path(path, info, n->path, n->pathlen); } -- cgit v1.2.3