diff options
Diffstat (limited to 'lib/decompress_unlzma.c')
-rw-r--r-- | lib/decompress_unlzma.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c index 32adb73a9038..0be83af62b88 100644 --- a/lib/decompress_unlzma.c +++ b/lib/decompress_unlzma.c | |||
@@ -65,11 +65,11 @@ static long long INIT read_int(unsigned char *ptr, int size) | |||
65 | #define LZMA_IOBUF_SIZE 0x10000 | 65 | #define LZMA_IOBUF_SIZE 0x10000 |
66 | 66 | ||
67 | struct rc { | 67 | struct rc { |
68 | int (*fill)(void*, unsigned int); | 68 | long (*fill)(void*, unsigned long); |
69 | uint8_t *ptr; | 69 | uint8_t *ptr; |
70 | uint8_t *buffer; | 70 | uint8_t *buffer; |
71 | uint8_t *buffer_end; | 71 | uint8_t *buffer_end; |
72 | int buffer_size; | 72 | long buffer_size; |
73 | uint32_t code; | 73 | uint32_t code; |
74 | uint32_t range; | 74 | uint32_t range; |
75 | uint32_t bound; | 75 | uint32_t bound; |
@@ -82,7 +82,7 @@ struct rc { | |||
82 | #define RC_MODEL_TOTAL_BITS 11 | 82 | #define RC_MODEL_TOTAL_BITS 11 |
83 | 83 | ||
84 | 84 | ||
85 | static int INIT nofill(void *buffer, unsigned int len) | 85 | static long INIT nofill(void *buffer, unsigned long len) |
86 | { | 86 | { |
87 | return -1; | 87 | return -1; |
88 | } | 88 | } |
@@ -99,8 +99,8 @@ static void INIT rc_read(struct rc *rc) | |||
99 | 99 | ||
100 | /* Called once */ | 100 | /* Called once */ |
101 | static inline void INIT rc_init(struct rc *rc, | 101 | static inline void INIT rc_init(struct rc *rc, |
102 | int (*fill)(void*, unsigned int), | 102 | long (*fill)(void*, unsigned long), |
103 | char *buffer, int buffer_size) | 103 | char *buffer, long buffer_size) |
104 | { | 104 | { |
105 | if (fill) | 105 | if (fill) |
106 | rc->fill = fill; | 106 | rc->fill = fill; |
@@ -280,7 +280,7 @@ struct writer { | |||
280 | size_t buffer_pos; | 280 | size_t buffer_pos; |
281 | int bufsize; | 281 | int bufsize; |
282 | size_t global_pos; | 282 | size_t global_pos; |
283 | int(*flush)(void*, unsigned int); | 283 | long (*flush)(void*, unsigned long); |
284 | struct lzma_header *header; | 284 | struct lzma_header *header; |
285 | }; | 285 | }; |
286 | 286 | ||
@@ -534,11 +534,11 @@ static inline int INIT process_bit1(struct writer *wr, struct rc *rc, | |||
534 | 534 | ||
535 | 535 | ||
536 | 536 | ||
537 | STATIC inline int INIT unlzma(unsigned char *buf, int in_len, | 537 | STATIC inline int INIT unlzma(unsigned char *buf, long in_len, |
538 | int(*fill)(void*, unsigned int), | 538 | long (*fill)(void*, unsigned long), |
539 | int(*flush)(void*, unsigned int), | 539 | long (*flush)(void*, unsigned long), |
540 | unsigned char *output, | 540 | unsigned char *output, |
541 | int *posp, | 541 | long *posp, |
542 | void(*error)(char *x) | 542 | void(*error)(char *x) |
543 | ) | 543 | ) |
544 | { | 544 | { |
@@ -667,11 +667,11 @@ exit_0: | |||
667 | } | 667 | } |
668 | 668 | ||
669 | #ifdef PREBOOT | 669 | #ifdef PREBOOT |
670 | STATIC int INIT decompress(unsigned char *buf, int in_len, | 670 | STATIC int INIT decompress(unsigned char *buf, long in_len, |
671 | int(*fill)(void*, unsigned int), | 671 | long (*fill)(void*, unsigned long), |
672 | int(*flush)(void*, unsigned int), | 672 | long (*flush)(void*, unsigned long), |
673 | unsigned char *output, | 673 | unsigned char *output, |
674 | int *posp, | 674 | long *posp, |
675 | void(*error)(char *x) | 675 | void(*error)(char *x) |
676 | ) | 676 | ) |
677 | { | 677 | { |