undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2019-07-31 00:38:20 -04:00 committed by Junio C Hamano
parent 37806080d7
commit b3b3cbcbf2
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/merge-tree.c
View File

@ -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);
}

5
tree-walk.h
View File

@ -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" */

6
unpack-trees.c
View File

@ -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) :