diff options
author | Jeff King <peff@peff.net> | 2019-07-31 07:38:20 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-08-01 23:06:52 +0300 |
commit | b3b3cbcbf246b1051ad453bc02e24a89573e2911 (patch) | |
tree | 3de6ade42d5a43eca2da12cd6053c57d0c4c66b5 /unpack-trees.c | |
parent | 37806080d7be1ab5b2fa918f6a528652596ea2c1 (diff) |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.c')
-rw-r--r-- | unpack-trees.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 8dbfb22770..492eff666a 100644 --- 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) : |