Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NK7XO-0000A0-3A for qemu-devel@nongnu.org; Mon, 14 Dec 2009 04:48:18 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NK7XI-00006y-Nj for qemu-devel@nongnu.org; Mon, 14 Dec 2009 04:48:17 -0500 Received: from [199.232.76.173] (port=42283 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NK7XI-00006o-DF for qemu-devel@nongnu.org; Mon, 14 Dec 2009 04:48:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59728) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NK7XI-0000df-1l for qemu-devel@nongnu.org; Mon, 14 Dec 2009 04:48:12 -0500 From: Markus Armbruster Date: Mon, 14 Dec 2009 10:48:05 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: [Qemu-devel] [FOR 0.12 PATCH] Simplify qemu_realloc() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org No functional change. Bonus: looks just like qemu_malloc() now. Signed-off-by: Markus Armbruster --- I tagged this "FOR 0.12" because I think you might want to consider it for 0.12, not because I think it must go into 0.12. qemu-malloc.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/qemu-malloc.c b/qemu-malloc.c index 5d9e34d..6cdc5de 100644 --- a/qemu-malloc.c +++ b/qemu-malloc.c @@ -61,12 +61,10 @@ void *qemu_malloc(size_t size) void *qemu_realloc(void *ptr, size_t size) { - if (size) { - return oom_check(realloc(ptr, size)); - } else if (allow_zero_malloc()) { - return oom_check(realloc(ptr, size ? size : 1)); + if (!size && !allow_zero_malloc()) { + abort(); } - abort(); + return oom_check(realloc(ptr, size ? size : 1)); } void *qemu_mallocz(size_t size)