From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=44545 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQeN5-0006G8-UG for qemu-devel@nongnu.org; Thu, 09 Dec 2010 06:09:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PQeN4-0000Fo-Um for qemu-devel@nongnu.org; Thu, 09 Dec 2010 06:09:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5010) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PQeN4-0000EH-HI for qemu-devel@nongnu.org; Thu, 09 Dec 2010 06:09:10 -0500 From: Kevin Wolf Date: Thu, 9 Dec 2010 12:09:59 +0100 Message-Id: <1291893010-29223-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1291893010-29223-1-git-send-email-kwolf@redhat.com> References: <1291893010-29223-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 03/14] Use qemu_mallocz() instead of calloc() in img_convert() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Jes Sorensen Signed-off-by: Jes Sorensen Signed-off-by: Kevin Wolf --- qemu-img.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index fa77ac0..eca99c4 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -699,11 +699,7 @@ static int img_convert(int argc, char **argv) return 1; } - bs = calloc(bs_n, sizeof(BlockDriverState *)); - if (!bs) { - error("Out of memory"); - return 1; - } + bs = qemu_mallocz(bs_n * sizeof(BlockDriverState *)); total_sectors = 0; for (bs_i = 0; bs_i < bs_n; bs_i++) { @@ -983,7 +979,7 @@ out: bdrv_delete(bs[bs_i]); } } - free(bs); + qemu_free(bs); if (ret) { return 1; } -- 1.7.2.3