]> git.proxmox.com Git - qemu.git/commitdiff
Simplify qemu_realloc()
authorMarkus Armbruster <armbru@redhat.com>
Mon, 14 Dec 2009 09:48:05 +0000 (10:48 +0100)
committerAurelien Jarno <aurelien@aurel32.net>
Tue, 23 Feb 2010 21:36:19 +0000 (22:36 +0100)
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>
qemu-malloc.c

index 5d9e34d69d713e1c238c2639acda422a4ae956f5..6cdc5deb788aecf955bd3fdb7806b9ffb95ad1e5 100644 (file)
@@ -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)