From a8c40471ab0851bf9a58f7dc76f121258e0690e2 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 21 Mar 2007 10:07:46 -0700 Subject: Remove "pathlen" from "struct name_entry" Since we have the "tree_entry_len()" helper function these days, and don't need to do a full strlen(), there's no point in saving the path length - it's just redundant information. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano --- tree.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tree.c') diff --git a/tree.c b/tree.c index 24f8fb6766..705a481255 100644 --- a/tree.c +++ b/tree.c @@ -101,14 +101,15 @@ int read_tree_recursive(struct tree *tree, if (S_ISDIR(entry.mode)) { int retval; char *newbase; + unsigned int pathlen = tree_entry_len(entry.path, entry.sha1); - newbase = xmalloc(baselen + 1 + entry.pathlen); + newbase = xmalloc(baselen + 1 + pathlen); memcpy(newbase, base, baselen); - memcpy(newbase + baselen, entry.path, entry.pathlen); - newbase[baselen + entry.pathlen] = '/'; + memcpy(newbase + baselen, entry.path, pathlen); + newbase[baselen + pathlen] = '/'; retval = read_tree_recursive(lookup_tree(entry.sha1), newbase, - baselen + entry.pathlen + 1, + baselen + pathlen + 1, stage, match, fn); free(newbase); if (retval) -- cgit v1.2.1