Commit e3ed0575 by Mike Frysinger Committed by Anatolij Gustschin

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: 's avatarMike Frysinger <vapier@gentoo.org>
parent 9a800ac7
......@@ -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;
......
......@@ -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
......
......@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment