summaryrefslogtreecommitdiff
path: root/read-tree.c
diff options
context:
space:
mode:
authorPeter Eriksen <s022018@student.dtu.dk>2006-04-03 19:30:46 +0100
committerJunio C Hamano <junkio@cox.net>2006-04-04 00:11:19 -0700
commit90321c106ca6e36c0e884ca677c9a52dea47bdde (patch)
treec574dde6987912d2197af80a5f7f8827cde263cc /read-tree.c
parent8e4402592574d630cdb5ab4f55a1b7131802ff72 (diff)
downloadgit-90321c106ca6e36c0e884ca677c9a52dea47bdde.tar.gz
Replace xmalloc+memset(0) with xcalloc.
Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'read-tree.c')
-rw-r--r--read-tree.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/read-tree.c b/read-tree.c
index eaff444196..58e56364e2 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);