From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M9OkA-00007E-T1 for qemu-devel@nongnu.org; Wed, 27 May 2009 15:24:54 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M9Ok6-00006B-0W for qemu-devel@nongnu.org; Wed, 27 May 2009 15:24:54 -0400 Received: from [199.232.76.173] (port=44302 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M9Ok5-000064-LI for qemu-devel@nongnu.org; Wed, 27 May 2009 15:24:49 -0400 Received: from moutng.kundenserver.de ([212.227.126.177]:53090) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M9Ok4-0002BT-Qw for qemu-devel@nongnu.org; Wed, 27 May 2009 15:24:49 -0400 Message-ID: <4A1D937A.7000201@mail.berlios.de> Date: Wed, 27 May 2009 21:24:42 +0200 From: Stefan Weil MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH] Fix prototype of function zfree. References: <4A19B448.7010704@mail.berlios.de> In-Reply-To: <4A19B448.7010704@mail.berlios.de> Content-Type: multipart/mixed; boundary="------------040202050303070006020705" List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: QEMU Developers This is a multi-part message in MIME format. --------------040202050303070006020705 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Stefan Weil schrieb: > Signed-off-by: Stefan Weil > --- > loader.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/loader.c b/loader.c > index 5232ee1..9350c54 100644 > --- a/loader.c > +++ b/loader.c > @@ -382,7 +382,7 @@ static void *zalloc(void *x, unsigned items, > unsigned size) > return (p); > } > > -static void zfree(void *x, void *addr, unsigned nb) > +static void zfree(void *x, void *addr) > { > qemu_free(addr); > } > @@ -430,7 +430,7 @@ static ssize_t gunzip(void *dst, size_t dstlen, > uint8_t *src, > } > > s.zalloc = zalloc; > - s.zfree = (free_func)zfree; > + s.zfree = zfree; > > r = inflateInit2(&s, -MAX_WBITS); > if (r != Z_OK) { > -- > 1.5.6.5 > > > The patch above was whitespace broken. The appended patch will work. Regards, Stefan Weil --------------040202050303070006020705 Content-Type: text/x-diff; name="0004-Fix-prototype-of-function-zfree.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0004-Fix-prototype-of-function-zfree.patch" >>From 850d19151523f20d5d841cd8d3d532b058d4749c Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 24 May 2009 22:54:06 +0200 Subject: [PATCH] Fix prototype of function zfree. Signed-off-by: Stefan Weil --- loader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/loader.c b/loader.c index 5232ee1..9350c54 100644 --- a/loader.c +++ b/loader.c @@ -382,7 +382,7 @@ static void *zalloc(void *x, unsigned items, unsigned size) return (p); } -static void zfree(void *x, void *addr, unsigned nb) +static void zfree(void *x, void *addr) { qemu_free(addr); } @@ -430,7 +430,7 @@ static ssize_t gunzip(void *dst, size_t dstlen, uint8_t *src, } s.zalloc = zalloc; - s.zfree = (free_func)zfree; + s.zfree = zfree; r = inflateInit2(&s, -MAX_WBITS); if (r != Z_OK) { -- 1.5.6.5 --------------040202050303070006020705--