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
twl4030_charger: increase end-of-charge current
[pandora-kernel.git]
/
lib
/
decompress_bunzip2.c
diff --git
a/lib/decompress_bunzip2.c
b/lib/decompress_bunzip2.c
index
81c8bb1
..
6a110e2
100644
(file)
--- a/
lib/decompress_bunzip2.c
+++ b/
lib/decompress_bunzip2.c
@@
-49,7
+49,6
@@
#define PREBOOT
#else
#include <linux/decompress/bunzip2.h>
#define PREBOOT
#else
#include <linux/decompress/bunzip2.h>
-#include <linux/slab.h>
#endif /* STATIC */
#include <linux/decompress/mm.h>
#endif /* STATIC */
#include <linux/decompress/mm.h>
@@
-186,7
+185,7
@@
static int INIT get_next_block(struct bunzip_data *bd)
if (get_bits(bd, 1))
return RETVAL_OBSOLETE_INPUT;
origPtr = get_bits(bd, 24);
if (get_bits(bd, 1))
return RETVAL_OBSOLETE_INPUT;
origPtr = get_bits(bd, 24);
- if (origPtr > dbufSize)
+ if (origPtr >
=
dbufSize)
return RETVAL_DATA_ERROR;
/* mapping table: if some byte values are never used (encoding things
like ascii text), the compression code removes the gaps to have fewer
return RETVAL_DATA_ERROR;
/* mapping table: if some byte values are never used (encoding things
like ascii text), the compression code removes the gaps to have fewer
@@
-682,13
+681,12
@@
STATIC int INIT bunzip2(unsigned char *buf, int len,
int(*flush)(void*, unsigned int),
unsigned char *outbuf,
int *pos,
int(*flush)(void*, unsigned int),
unsigned char *outbuf,
int *pos,
- void(*error
_fn
)(char *x))
+ void(*error)(char *x))
{
struct bunzip_data *bd;
int i = -1;
unsigned char *inbuf;
{
struct bunzip_data *bd;
int i = -1;
unsigned char *inbuf;
- set_error_fn(error_fn);
if (flush)
outbuf = malloc(BZIP2_IOBUF_SIZE);
if (flush)
outbuf = malloc(BZIP2_IOBUF_SIZE);
@@
-751,8
+749,8
@@
STATIC int INIT decompress(unsigned char *buf, int len,
int(*flush)(void*, unsigned int),
unsigned char *outbuf,
int *pos,
int(*flush)(void*, unsigned int),
unsigned char *outbuf,
int *pos,
- void(*error
_fn
)(char *x))
+ void(*error)(char *x))
{
{
- return bunzip2(buf, len - 4, fill, flush, outbuf, pos, error
_fn
);
+ return bunzip2(buf, len - 4, fill, flush, outbuf, pos, error);
}
#endif
}
#endif