summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorBrandon Casey <casey@nrlssc.navy.mil>2008-10-06 23:39:10 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-10-08 14:30:59 (GMT)
commit19d4b416f429ac2d3f4c225aaf1af8761bcb03dd (patch)
tree6675797b5e141a32cf8c4d551be3dddc5e5fc020 /merge-tree.c
parent276328ffb87cefdc515bee5f09916aea6e0244ed (diff)
downloadgit-19d4b416f429ac2d3f4c225aaf1af8761bcb03dd.zip
git-19d4b416f429ac2d3f4c225aaf1af8761bcb03dd.tar.gz
git-19d4b416f429ac2d3f4c225aaf1af8761bcb03dd.tar.bz2
Replace xmalloc/memset(0) pairs with xcalloc
Many call sites immediately initialize allocated memory with zero after calling xmalloc. A single call to xcalloc can replace this two-call sequence. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'merge-tree.c')
-rw-r--r--merge-tree.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/merge-tree.c b/merge-tree.c
index 02fc10f..2d1413e 100644
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -158,9 +158,8 @@ static int same_entry(struct name_entry *a, struct name_entry *b)
static struct merge_list *create_entry(unsigned stage, unsigned mode, const unsigned char *sha1, const char *path)
{
- struct merge_list *res = xmalloc(sizeof(*res));
+ struct merge_list *res = xcalloc(1, sizeof(*res));
- memset(res, 0, sizeof(*res));
res->stage = stage;
res->path = path;
res->mode = mode;