diff options
Diffstat (limited to 'lib/decompress_bunzip2.c')
-rw-r--r-- | lib/decompress_bunzip2.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c index 81c8bb1cc6a..a7b80c1d6a0 100644 --- a/lib/decompress_bunzip2.c +++ b/lib/decompress_bunzip2.c | |||
@@ -49,7 +49,6 @@ | |||
49 | #define PREBOOT | 49 | #define PREBOOT |
50 | #else | 50 | #else |
51 | #include <linux/decompress/bunzip2.h> | 51 | #include <linux/decompress/bunzip2.h> |
52 | #include <linux/slab.h> | ||
53 | #endif /* STATIC */ | 52 | #endif /* STATIC */ |
54 | 53 | ||
55 | #include <linux/decompress/mm.h> | 54 | #include <linux/decompress/mm.h> |
@@ -682,13 +681,12 @@ STATIC int INIT bunzip2(unsigned char *buf, int len, | |||
682 | int(*flush)(void*, unsigned int), | 681 | int(*flush)(void*, unsigned int), |
683 | unsigned char *outbuf, | 682 | unsigned char *outbuf, |
684 | int *pos, | 683 | int *pos, |
685 | void(*error_fn)(char *x)) | 684 | void(*error)(char *x)) |
686 | { | 685 | { |
687 | struct bunzip_data *bd; | 686 | struct bunzip_data *bd; |
688 | int i = -1; | 687 | int i = -1; |
689 | unsigned char *inbuf; | 688 | unsigned char *inbuf; |
690 | 689 | ||
691 | set_error_fn(error_fn); | ||
692 | if (flush) | 690 | if (flush) |
693 | outbuf = malloc(BZIP2_IOBUF_SIZE); | 691 | outbuf = malloc(BZIP2_IOBUF_SIZE); |
694 | 692 | ||
@@ -751,8 +749,8 @@ STATIC int INIT decompress(unsigned char *buf, int len, | |||
751 | int(*flush)(void*, unsigned int), | 749 | int(*flush)(void*, unsigned int), |
752 | unsigned char *outbuf, | 750 | unsigned char *outbuf, |
753 | int *pos, | 751 | int *pos, |
754 | void(*error_fn)(char *x)) | 752 | void(*error)(char *x)) |
755 | { | 753 | { |
756 | return bunzip2(buf, len - 4, fill, flush, outbuf, pos, error_fn); | 754 | return bunzip2(buf, len - 4, fill, flush, outbuf, pos, error); |
757 | } | 755 | } |
758 | #endif | 756 | #endif |