From: Markus Armbruster <armbru@redhat.com>
Date: Mon, 14 Dec 2009 09:48:05 +0000 (+0100)
Subject: Simplify qemu_realloc()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f8b0953bd5e34f87458108051a485246d40adadc;p=qemu.git

Simplify qemu_realloc()

No functional change.  Bonus: looks just like qemu_malloc() now.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/qemu-malloc.c b/qemu-malloc.c
index 5d9e34d69d..6cdc5deb78 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)