diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2012-04-09 13:39:53 +0000 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2012-04-30 16:54:51 +0200 |
| commit | e3ed0575a7ce68c1c533978fc171c7611598dc4e (patch) | |
| tree | b3961648748950bd490b193f469b3c4d71d56702 | |
| parent | 9a800ac718abcac0aff6f98b922ceb236f411ffd (diff) | |
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>
| -rw-r--r-- | fs/cramfs/uncompress.c | 7 | ||||
| -rw-r--r-- | include/u-boot/zlib.h | 3 | ||||
| -rw-r--r-- | lib/gunzip.c | 11 |
3 files changed, 9 insertions, 12 deletions
diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c index 228fe68c11a..f431cc46c1f 100644 --- 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 fb2708186dc..fbb08a32879 100644 --- 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 8b16b2495fb..99a8ab02876 100644 --- 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) { |