diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:54:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:54:23 -0800 |
| commit | aa21cc97bd10ab0b62f6d951ff2ff725261e326e (patch) | |
| tree | 69e983408fd1a4f599ea00d6b70599a00282be06 /tree-walk.c | |
| parent | 883326077a1995a5ea122c298ff47fcd85782c49 (diff) | |
| parent | 5290d4513496d89f84570985a0e02e97dff477ff (diff) | |
| download | git-aa21cc97bd10ab0b62f6d951ff2ff725261e326e.tar.gz | |
Merge branch 'jk/alloc-cleanups'
Misc code clean-ups.
* jk/alloc-cleanups:
tree-walk.c: break circular dependency with unpack-trees
traverse_trees(): use stack array for name entries
walker_fetch(): avoid raw array length computation
normalize_path_copy(): document "dst" size expectations
Diffstat (limited to 'tree-walk.c')
| -rw-r--r-- | tree-walk.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tree-walk.c b/tree-walk.c index d5a8e096a6..bb0ad34c54 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -1,6 +1,5 @@ #include "cache.h" #include "tree-walk.h" -#include "unpack-trees.h" #include "dir.h" #include "object-store.h" #include "tree.h" @@ -410,15 +409,20 @@ int traverse_trees(struct index_state *istate, struct traverse_info *info) { int error = 0; - struct name_entry *entry = xmalloc(n*sizeof(*entry)); + struct name_entry entry[MAX_TRAVERSE_TREES]; int i; - struct tree_desc_x *tx = xcalloc(n, sizeof(*tx)); + struct tree_desc_x tx[ARRAY_SIZE(entry)]; struct strbuf base = STRBUF_INIT; int interesting = 1; char *traverse_path; - for (i = 0; i < n; i++) + if (n >= ARRAY_SIZE(entry)) + BUG("traverse_trees() called with too many trees (%d)", n); + + for (i = 0; i < n; i++) { tx[i].d = t[i]; + tx[i].skip = NULL; + } if (info->prev) { strbuf_make_traverse_path(&base, info->prev, @@ -506,10 +510,8 @@ int traverse_trees(struct index_state *istate, if (mask & (1ul << i)) update_extended_entry(tx + i, entry + i); } - free(entry); for (i = 0; i < n; i++) free_extended_entry(tx + i); - free(tx); free(traverse_path); info->traverse_path = NULL; strbuf_release(&base); |