diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-04 00:23:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-04 00:23:36 -0700 |
| commit | 00cbdec981e186264dc2529edce31da4bcbd41f3 (patch) | |
| tree | d1c0436f5087526442b6e35e619daf33c4ccde97 /read-tree.c | |
| parent | b411fda15df4897a1308bbb5950088ea6138cbad (diff) | |
| parent | 90321c106ca6e36c0e884ca677c9a52dea47bdde (diff) | |
| download | git-00cbdec981e186264dc2529edce31da4bcbd41f3.tar.gz git-00cbdec981e186264dc2529edce31da4bcbd41f3.tar.xz | |
Merge branch 'pe/cleanup' into next
* pe/cleanup:
Replace xmalloc+memset(0) with xcalloc.
Use blob_, commit_, tag_, and tree_type throughout.
Diffstat (limited to 'read-tree.c')
| -rw-r--r-- | read-tree.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/read-tree.c b/read-tree.c index 4422dbf42..26f4f7e32 100644 --- a/read-tree.c +++ b/read-tree.c @@ -133,11 +133,9 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len, pathlen = strlen(first); ce_size = cache_entry_size(baselen + pathlen); - src = xmalloc(sizeof(struct cache_entry *) * src_size); - memset(src, 0, sizeof(struct cache_entry *) * src_size); + src = xcalloc(src_size, sizeof(struct cache_entry *)); - subposns = xmalloc(sizeof(struct tree_list_entry *) * len); - memset(subposns, 0, sizeof(struct tree_list_entry *) * len); + subposns = xcalloc(len, sizeof(struct tree_list_entry *)); if (cache_name && !strcmp(cache_name, first)) { any_files = 1; @@ -177,8 +175,7 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len, else ce_stage = 2; - ce = xmalloc(ce_size); - memset(ce, 0, ce_size); + ce = xcalloc(1, ce_size); ce->ce_mode = create_ce_mode(posns[i]->mode); ce->ce_flags = create_ce_flags(baselen + pathlen, ce_stage); |