From: Peter Malone <peter.malone@gmail.com>
Date: Thu, 16 Feb 2017 20:42:26 +0000 (-0500)
Subject: ringtest: ring.c malloc & memset to calloc
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=03ee47ae8a7c608975be7e45287bff0482e295d6;p=linux.git

ringtest: ring.c malloc & memset to calloc

Code cleanup change - moving from malloc & memset to calloc.

Signed-off-by: Peter Malone <peter.malone@gmail.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/tools/virtio/ringtest/ring.c b/tools/virtio/ringtest/ring.c
index 2b9859beea652..5a41404aaef56 100644
--- a/tools/virtio/ringtest/ring.c
+++ b/tools/virtio/ringtest/ring.c
@@ -84,12 +84,11 @@ void alloc_ring(void)
 		perror("Unable to allocate ring buffer.\n");
 		exit(3);
 	}
-	event = malloc(sizeof *event);
+	event = calloc(1, sizeof(*event));
 	if (!event) {
 		perror("Unable to allocate event buffer.\n");
 		exit(3);
 	}
-	memset(event, 0, sizeof *event);
 	guest.avail_idx = 0;
 	guest.kicked_avail_idx = -1;
 	guest.last_used_idx = 0;
@@ -102,12 +101,11 @@ void alloc_ring(void)
 		ring[i] = desc;
 	}
 	guest.num_free = ring_size;
-	data = malloc(ring_size * sizeof *data);
+	data = calloc(ring_size, sizeof(*data));
 	if (!data) {
 		perror("Unable to allocate data buffer.\n");
 		exit(3);
 	}
-	memset(data, 0, ring_size * sizeof *data);
 }
 
 /* guest side */