aboutsummaryrefslogtreecommitdiffstats
path: root/lib/zlib_inflate/inflate.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-10-12 01:15:08 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-12 01:17:20 -0400
commitd4faaecbcc6d9ea4f7c05f6de6af98e2336a4afb (patch)
tree20ce6e4991c0dc3b0701fbb0b37819f19d3e9d00 /lib/zlib_inflate/inflate.c
parent9ce768ead83216d394175c0a0d72bc527648c7d0 (diff)
[ZLIB]: Fix external builds of zlib_inflate code.
Move zlib_inflate_blob() out into it's own source file, infutil.c, so that things like the powerpc zImage builder in arch/powerpc/boot/Makefile don't end up trying to compile it. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/zlib_inflate/inflate.c')
-rw-r--r--lib/zlib_inflate/inflate.c47
1 files changed, 0 insertions, 47 deletions
diff --git a/lib/zlib_inflate/inflate.c b/lib/zlib_inflate/inflate.c
index 0ad1ebf00947..f5ce87b0800e 100644
--- a/lib/zlib_inflate/inflate.c
+++ b/lib/zlib_inflate/inflate.c
@@ -916,50 +916,3 @@ int zlib_inflateIncomp(z_stream *z)
916 916
917 return Z_OK; 917 return Z_OK;
918} 918}
919
920#include <linux/errno.h>
921#include <linux/slab.h>
922#include <linux/vmalloc.h>
923
924/* Utility function: initialize zlib, unpack binary blob, clean up zlib,
925 * return len or negative error code. */
926int zlib_inflate_blob(void *gunzip_buf, unsigned sz, const void *buf, unsigned len)
927{
928 const u8 *zbuf = buf;
929 struct z_stream_s *strm;
930 int rc;
931
932 rc = -ENOMEM;
933 strm = kmalloc(sizeof(*strm), GFP_KERNEL);
934 if (strm == NULL)
935 goto gunzip_nomem1;
936 strm->workspace = kmalloc(zlib_inflate_workspacesize(), GFP_KERNEL);
937 if (strm->workspace == NULL)
938 goto gunzip_nomem2;
939
940 /* gzip header (1f,8b,08... 10 bytes total + possible asciz filename)
941 * expected to be stripped from input */
942
943 strm->next_in = zbuf;
944 strm->avail_in = len;
945 strm->next_out = gunzip_buf;
946 strm->avail_out = sz;
947
948 rc = zlib_inflateInit2(strm, -MAX_WBITS);
949 if (rc == Z_OK) {
950 rc = zlib_inflate(strm, Z_FINISH);
951 /* after Z_FINISH, only Z_STREAM_END is "we unpacked it all" */
952 if (rc == Z_STREAM_END)
953 rc = sz - strm->avail_out;
954 else
955 rc = -EINVAL;
956 zlib_inflateEnd(strm);
957 } else
958 rc = -EINVAL;
959
960 kfree(strm->workspace);
961gunzip_nomem2:
962 kfree(strm);
963gunzip_nomem1:
964 return rc; /* returns Z_OK (0) if successful */
965}