summaryrefslogtreecommitdiff
path: root/fs/cramfs
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-04-09 13:39:53 +0000
committerAnatolij Gustschin <agust@denx.de>2012-04-30 16:54:51 +0200
commite3ed0575a7ce68c1c533978fc171c7611598dc4e (patch)
treeb3961648748950bd490b193f469b3c4d71d56702 /fs/cramfs
parent9a800ac718abcac0aff6f98b922ceb236f411ffd (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>
Diffstat (limited to 'fs/cramfs')
-rw-r--r--fs/cramfs/uncompress.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c
index 228fe68c11..f431cc46c1 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;