[Qemu-devel] [PATCH] Fix prototype of function zfree.

[Qemu-devel] [PATCH] Fix prototype of function zfree.

[Stefan Weil]

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 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

Re: [Qemu-devel] [PATCH] Fix prototype of function zfree.

[Stefan Weil]

[-- Attachment #1: Type: text/plain, Size: 866 bytes --]

Stefan Weil schrieb:
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
> ---
>  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


[-- Attachment #2: 0004-Fix-prototype-of-function-zfree.patch --]
[-- Type: text/x-diff, Size: 891 bytes --]

>From 850d19151523f20d5d841cd8d3d532b058d4749c Mon Sep 17 00:00:00 2001
From: Stefan Weil <weil@mail.berlios.de>
Date: Sun, 24 May 2009 22:54:06 +0200
Subject: [PATCH] Fix prototype of function zfree.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 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