gunzip: rename z{alloc, free} to gz{alloc, free}

This allows us to add a proper zalloc() func (one that does a zeroing
alloc), and removes duplicate prototypes.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c
index 228fe68c11a14f7832ad3a8b7b91ae5c92fa7a75..f431cc46c1f756bb3100d5dd9830099c241cc628 100644 (file)
--- a/fs/cramfs/uncompress.c
+++ b/fs/cramfs/uncompress.c
@@ -27,9 +27,6 @@
 
 static z_stream stream;
 
-void *zalloc(void *, unsigned, unsigned);
-void zfree(void *, void *, unsigned);
-
 /* Returns length of decompressed data. */
 int cramfs_uncompress_block (void *dst, void *src, int srclen)
 {
@@ -59,8 +56,8 @@ int cramfs_uncompress_init (void)
 {
        int err;
 
-       stream.zalloc = zalloc;
-       stream.zfree = zfree;
+       stream.zalloc = gzalloc;
+       stream.zfree = gzfree;
        stream.next_in = 0;
        stream.avail_in = 0;
 

diff --git a/include/u-boot/zlib.h b/include/u-boot/zlib.h
index fb2708186dcf7b0adb79b0c9eea89edcec50b201..fbb08a32879e68b102cb9d1bdff1ca5aaf488ed3 100644 (file)
--- a/include/u-boot/zlib.h
+++ b/include/u-boot/zlib.h
@@ -691,6 +691,9 @@ ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
        struct internal_state {int dummy;}; /* hack for buggy compilers */
 #endif
 
+extern void *gzalloc(void *, unsigned, unsigned);
+extern void gzfree(void *, void *, unsigned);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/gunzip.c b/lib/gunzip.c
index 8b16b2495fbec50956ff027c5e49803435034592..99a8ab028760bbd2d5ae44e5e4eed03b2f99106a 100644 (file)
--- a/lib/gunzip.c
+++ b/lib/gunzip.c
@@ -36,10 +36,7 @@
 #define RESERVED               0xe0
 #define DEFLATED               8
 
-void *zalloc(void *, unsigned, unsigned);
-void zfree(void *, void *, unsigned);
-
-void *zalloc(void *x, unsigned items, unsigned size)
+void *gzalloc(void *x, unsigned items, unsigned size)
 {
        void *p;
 
@@ -51,7 +48,7 @@ void *zalloc(void *x, unsigned items, unsigned size)
        return (p);
 }
 
-void zfree(void *x, void *addr, unsigned nb)
+void gzfree(void *x, void *addr, unsigned nb)
 {
        free (addr);
 }
@@ -94,8 +91,8 @@ int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
        z_stream s;
        int r;
 
-       s.zalloc = zalloc;
-       s.zfree = zfree;
+       s.zalloc = gzalloc;
+       s.zfree = gzfree;
 
        r = inflateInit2(&s, -MAX_WBITS);
        if (r != Z_OK) {