From f7e3bceff7cac6d28adee947d89263a2fab48b7d Mon Sep 17 00:00:00 2001
From: Alexander Nedotsukov <bland@FreeBSD.org>
Date: Thu, 19 Oct 2006 08:31:33 +0000
Subject: [PATCH] Replaced malloc/memset pairs with single calloc() call.

---
 trunk/libburn/source.c    | 3 +--
 trunk/libburn/structure.c | 9 +++------
 trunk/libburn/write.c     | 3 +--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/trunk/libburn/source.c b/trunk/libburn/source.c
index fd0c56b6..f77188cb 100644
--- a/trunk/libburn/source.c
+++ b/trunk/libburn/source.c
@@ -29,8 +29,7 @@ struct burn_source *burn_source_new(void)
 {
 	struct burn_source *out;
 
-	out = malloc(sizeof(struct burn_source));
-	memset(out, 0, sizeof(struct burn_source));
+	out = calloc(1, sizeof(struct burn_source));
 	out->refcount = 1;
 	return out;
 }
diff --git a/trunk/libburn/structure.c b/trunk/libburn/structure.c
index 67bdcfa1..22c1bc81 100644
--- a/trunk/libburn/structure.c
+++ b/trunk/libburn/structure.c
@@ -39,8 +39,7 @@ extern struct libdax_msgs *libdax_messenger;
 struct burn_disc *burn_disc_create(void)
 {
 	struct burn_disc *d;
-	d = malloc(sizeof(struct burn_disc));
-	memset(d, 0, sizeof(struct burn_disc));
+	d = calloc(1, sizeof(struct burn_disc));
 	d->refcnt = 1;
 	d->sessions = 0;
 	d->session = NULL;
@@ -64,8 +63,7 @@ void burn_disc_free(struct burn_disc *d)
 struct burn_session *burn_session_create(void)
 {
 	struct burn_session *s;
-	s = malloc(sizeof(struct burn_session));
-	memset(s, 0, sizeof(struct burn_session));
+	s = calloc(1, sizeof(struct burn_session));
 	s->refcnt = 1;
 	s->tracks = 0;
 	s->track = NULL;
@@ -105,8 +103,7 @@ int burn_disc_add_session(struct burn_disc *d, struct burn_session *s,
 struct burn_track *burn_track_create(void)
 {
 	struct burn_track *t;
-	t = malloc(sizeof(struct burn_track));
-	memset(t, 0, sizeof(struct burn_track));
+	t = calloc(1, sizeof(struct burn_track));
 	t->refcnt = 1;
 	t->indices = 0;
 	t->offset = 0;
diff --git a/trunk/libburn/write.c b/trunk/libburn/write.c
index f5df79b8..23939db7 100644
--- a/trunk/libburn/write.c
+++ b/trunk/libburn/write.c
@@ -235,9 +235,8 @@ struct cue_sheet *burn_create_toc_entries(struct burn_write_opts *o,
 		goto failed;
 	}
 
-	d->toc_entry = malloc(d->toc_entries * sizeof(struct burn_toc_entry));
+	d->toc_entry = calloc(d->toc_entries, sizeof(struct burn_toc_entry));
 	e = d->toc_entry;
-	memset((void *)e, 0, d->toc_entries * sizeof(struct burn_toc_entry));
 	e[0].point = 0xA0;
 	if (tar[0]->mode & BURN_AUDIO)
 		e[0].control = TOC_CONTROL_AUDIO;