git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
lib
/
decompress_inflate.c
diff --git
a/lib/decompress_inflate.c
b/lib/decompress_inflate.c
index
e36b296
..
68dfce5
100644
(file)
--- a/
lib/decompress_inflate.c
+++ b/
lib/decompress_inflate.c
@@
-19,13
+19,13
@@
#include "zlib_inflate/inflate.h"
#include "zlib_inflate/infutil.h"
#include "zlib_inflate/inflate.h"
#include "zlib_inflate/infutil.h"
+#include <linux/slab.h>
#endif /* STATIC */
#include <linux/decompress/mm.h>
#endif /* STATIC */
#include <linux/decompress/mm.h>
-#include <linux/slab.h>
-#define
INBUF_LEN
(16*1024)
+#define
GZIP_IOBUF_SIZE
(16*1024)
/* Included from initramfs et al code */
STATIC int INIT gunzip(unsigned char *buf, int len,
/* Included from initramfs et al code */
STATIC int INIT gunzip(unsigned char *buf, int len,
@@
-55,7
+55,7
@@
STATIC int INIT gunzip(unsigned char *buf, int len,
if (buf)
zbuf = buf;
else {
if (buf)
zbuf = buf;
else {
- zbuf = malloc(
INBUF_LEN
);
+ zbuf = malloc(
GZIP_IOBUF_SIZE
);
len = 0;
}
if (!zbuf) {
len = 0;
}
if (!zbuf) {
@@
-77,7
+77,7
@@
STATIC int INIT gunzip(unsigned char *buf, int len,
}
if (len == 0)
}
if (len == 0)
- len = fill(zbuf,
INBUF_LEN
);
+ len = fill(zbuf,
GZIP_IOBUF_SIZE
);
/* verify the gzip header */
if (len < 10 ||
/* verify the gzip header */
if (len < 10 ||
@@
-113,7
+113,7
@@
STATIC int INIT gunzip(unsigned char *buf, int len,
while (rc == Z_OK) {
if (strm->avail_in == 0) {
/* TODO: handle case where both pos and fill are set */
while (rc == Z_OK) {
if (strm->avail_in == 0) {
/* TODO: handle case where both pos and fill are set */
- len = fill(zbuf,
INBUF_LEN
);
+ len = fill(zbuf,
GZIP_IOBUF_SIZE
);
if (len < 0) {
rc = -1;
error("read error");
if (len < 0) {
rc = -1;
error("read error");