projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
read-cache.c: use xcalloc() not calloc()
[git.git]
/
read-tree.c
diff --git
a/read-tree.c
b/read-tree.c
index
4422dbf
..
e926e4c
100644
(file)
--- 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);
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;
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;
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);
ce->ce_mode = create_ce_mode(posns[i]->mode);
ce->ce_flags = create_ce_flags(baselen + pathlen,
ce_stage);
@@
-797,8
+794,8
@@
int main(int argc, char **argv)
if (1 < index_only + update)
usage(read_tree_usage);
if (1 < index_only + update)
usage(read_tree_usage);
- if (get_sha1(arg, sha1)
< 0
)
-
usage(read_tree_usage
);
+ if (get_sha1(arg, sha1))
+
die("Not a valid object name %s", arg
);
if (list_tree(sha1) < 0)
die("failed to unpack tree object %s", arg);
stage++;
if (list_tree(sha1) < 0)
die("failed to unpack tree object %s", arg);
stage++;