tree-walk: accept a raw length for traverse_path_len()

peff · gitster · commit b3b3cbcbf246 · 2019-08-01T13:06:52.000-07:00
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 &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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);
 }
 
diff --git a/tree-walk.h b/tree-walk.h
@@ -74,9 +74,10 @@ char *make_traverse_path(char *path, const struct traverse_info *info,
 			 const char *name, size_t namelen);
 void setup_traverse_info(struct traverse_info *info, const char *base);
 
-static inline size_t traverse_path_len(const struct traverse_info *info, const struct name_entry *n)
+static inline size_t traverse_path_len(const struct traverse_info *info,
+				       size_t namelen)
 {
-	return st_add(info->pathlen, tree_entry_len(n));
+	return st_add(info->pathlen, namelen);
 }
 
 /* in general, positive means "kind of interesting" */
diff --git a/unpack-trees.c b/unpack-trees.c
@@ -686,7 +686,7 @@ static int index_pos_by_traverse_info(struct name_entry *names,
 				      struct traverse_info *info)
 {
 	struct unpack_trees_options *o = info->data;
-	size_t len = traverse_path_len(info, names);
+	size_t len = traverse_path_len(info, tree_entry_len(names));
 	char *name = xmalloc(len + 1 /* slash */ + 1 /* NUL */);
 	int pos;
 
@@ -936,7 +936,7 @@ static int compare_entry(const struct cache_entry *ce, const struct traverse_inf
 	 * Even if the beginning compared identically, the ce should
 	 * compare as bigger than a directory leading up to it!
 	 */
-	return ce_namelen(ce) > traverse_path_len(info, n);
+	return ce_namelen(ce) > traverse_path_len(info, tree_entry_len(n));
 }
 
 static int ce_in_traverse_path(const struct cache_entry *ce,
@@ -960,7 +960,7 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info,
 	struct index_state *istate,
 	int is_transient)
 {
-	size_t len = traverse_path_len(info, n);
+	size_t len = traverse_path_len(info, tree_entry_len(n));
 	struct cache_entry *ce =
 		is_transient ?
 		make_empty_transient_cache_entry(len) :

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ static struct merge_list *create_entry(unsigned stage, unsigned mode, const stru`
`180`	`180`
`181`	`181`	`static char traverse_path(const struct traverse_info info, const struct name_entry *n)`
`182`	`182`	`{`
`183`		`- char *path = xmallocz(traverse_path_len(info, n));`
	`183`	`+ char *path = xmallocz(traverse_path_len(info, tree_entry_len(n)));`
`184`	`184`	`return make_traverse_path(path, info, n->path, n->pathlen);`
`185`	`185`	`}`
`186`	`186`
Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,10 @@ char make_traverse_path(char path, const struct traverse_info *info,`
`74`	`74`	`const char *name, size_t namelen);`
`75`	`75`	`void setup_traverse_info(struct traverse_info info, const char base);`
`76`	`76`
`77`		`-static inline size_t traverse_path_len(const struct traverse_info info, const struct name_entry n)`
	`77`	`+static inline size_t traverse_path_len(const struct traverse_info *info,`
	`78`	`+ size_t namelen)`
`78`	`79`	`{`
`79`		`- return st_add(info->pathlen, tree_entry_len(n));`
	`80`	`+ return st_add(info->pathlen, namelen);`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`/* in general, positive means "kind of interesting" */`