From 6243e7c65079b87cc2a3a75642d71c8f8e94f97a Mon Sep 17 00:00:00 2001
From: Pierre Schweitzer <pierre@reactos.org>
Date: Sun, 21 Jul 2013 16:15:16 +0000
Subject: [PATCH] [CDMAKE] Use calloc instead of malloc + memset

svn path=/trunk/; revision=59548
---
 reactos/tools/cdmake/cdmake.c  | 9 +++------
 reactos/tools/cdmake/dirhash.c | 6 ++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/reactos/tools/cdmake/cdmake.c b/reactos/tools/cdmake/cdmake.c
index e82e7c987c7..5d365f0e3f2 100644
--- a/reactos/tools/cdmake/cdmake.c
+++ b/reactos/tools/cdmake/cdmake.c
@@ -652,10 +652,9 @@ new_directory_record (struct _finddata_t *f,
 {
   PDIR_RECORD d;
 
-  d = malloc(sizeof(DIR_RECORD));
+  d = calloc(1, sizeof(DIR_RECORD));
   if (d == NULL)
     error_exit("Insufficient memory");
-  memset ( d, 0, sizeof(DIR_RECORD) );
   d->next_in_memory = root.next_in_memory;
   root.next_in_memory = d;
 
@@ -687,10 +686,9 @@ new_directory_record (struct dirent *entry,
   char *n;
 	*/
 
-  d = malloc(sizeof(DIR_RECORD));
+  d = calloc(1, sizeof(DIR_RECORD));
   if (d == NULL)
     error_exit("Insufficient memory");
-  memset ( d, 0, sizeof(DIR_RECORD) );
   d->next_in_memory = root.next_in_memory;
   root.next_in_memory = d;
 
@@ -1071,8 +1069,7 @@ static PDIR_RECORD
 new_empty_dirrecord(PDIR_RECORD d, BOOL directory)
 {
     PDIR_RECORD new_d;
-    new_d = malloc(sizeof(*new_d));
-    memset(new_d, 0, sizeof(*new_d));
+    new_d = calloc(1, sizeof(*new_d));
     new_d->parent = d;
     new_d->level = d->level + 1;
     new_d->next_in_directory = d->first_record;
diff --git a/reactos/tools/cdmake/dirhash.c b/reactos/tools/cdmake/dirhash.c
index 528b10496ea..1ad00b8fcb8 100644
--- a/reactos/tools/cdmake/dirhash.c
+++ b/reactos/tools/cdmake/dirhash.c
@@ -111,8 +111,7 @@ dir_hash_create_dir(struct target_dir_hash *dh, const char *casename, const char
     free(parentname);
     free(parentcase);
     hashcode = djb_hash(targetnorm);
-    de = malloc(sizeof(*de));
-    memset(de, 0, sizeof(*de));
+    de = calloc(1, sizeof(*de));
     de->parent = parent_de;
     de->normalized_name = strdup(targetnorm);
     de->case_name = strdup(chop_filename(casename));
@@ -139,8 +138,7 @@ void dir_hash_add_file(struct target_dir_hash *dh, const char *source, const cha
     targetnorm = strdup(targetdir);
     normalize_dirname(targetnorm);
     de = dir_hash_create_dir(dh, targetdir, targetnorm);
-    tf = malloc(sizeof(*tf));
-    memset(tf, 0, sizeof(*tf));
+    tf = calloc(1, sizeof(*tf));
     tf->next = de->head;
     de->head = tf;
     tf->source_name = strdup(source);