Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nk2Sr-0000mt-Vo for qemu-devel@nongnu.org; Tue, 23 Feb 2010 16:38:46 -0500 Received: from [199.232.76.173] (port=38294 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nk2Sq-0000mj-Mq for qemu-devel@nongnu.org; Tue, 23 Feb 2010 16:38:44 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nk2Sp-0006LO-5S for qemu-devel@nongnu.org; Tue, 23 Feb 2010 16:38:44 -0500 Received: from hall.aurel32.net ([88.191.82.174]:48911) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Nk2So-0006L4-LU for qemu-devel@nongnu.org; Tue, 23 Feb 2010 16:38:43 -0500 Date: Tue, 23 Feb 2010 22:38:39 +0100 From: Aurelien Jarno Subject: Re: [Qemu-devel] [FOR 0.12 PATCH] Simplify qemu_realloc() Message-ID: <20100223213839.GD24081@volta.aurel32.net> References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: qemu-devel@nongnu.org On Mon, Dec 14, 2009 at 10:48:05AM +0100, Markus Armbruster wrote: > 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. It's clearly too late for 0.12, but as your patch makes sense, I have committed it to HEAD. > 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) > > > -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien@aurel32.net http://www.aurel32.net