UBI: Fastmap: Calc fastmap size correctly

[sfrench/cifs-2.6.git] / lib / decompress_unlzma.c

diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c
index 32adb73a903811c4b05d49fea6f9401c13cf396e..0be83af62b884c3dbfa9f29f9630a5ecfd605e2f 100644 (file)
--- 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)
 #define LZMA_IOBUF_SIZE        0x10000
 
 struct rc {
-       int (*fill)(void*, unsigned int);
+       long (*fill)(void*, unsigned long);
        uint8_t *ptr;
        uint8_t *buffer;
        uint8_t *buffer_end;
-       int buffer_size;
+       long buffer_size;
        uint32_t code;
        uint32_t range;
        uint32_t bound;
@@ -82,7 +82,7 @@ struct rc {
 #define RC_MODEL_TOTAL_BITS 11
 
 
-static int INIT nofill(void *buffer, unsigned int len)
+static long INIT nofill(void *buffer, unsigned long len)
 {
        return -1;
 }
@@ -99,8 +99,8 @@ static void INIT rc_read(struct rc *rc)
 
 /* Called once */
 static inline void INIT rc_init(struct rc *rc,
-                                      int (*fill)(void*, unsigned int),
-                                      char *buffer, int buffer_size)
+                                      long (*fill)(void*, unsigned long),
+                                      char *buffer, long buffer_size)
 {
        if (fill)
                rc->fill = fill;
@@ -280,7 +280,7 @@ struct writer {
        size_t buffer_pos;
        int bufsize;
        size_t global_pos;
-       int(*flush)(void*, unsigned int);
+       long (*flush)(void*, unsigned long);
        struct lzma_header *header;
 };
 
@@ -534,11 +534,11 @@ static inline int INIT process_bit1(struct writer *wr, struct rc *rc,
 
 
 
-STATIC inline int INIT unlzma(unsigned char *buf, int in_len,
-                             int(*fill)(void*, unsigned int),
-                             int(*flush)(void*, unsigned int),
+STATIC inline int INIT unlzma(unsigned char *buf, long in_len,
+                             long (*fill)(void*, unsigned long),
+                             long (*flush)(void*, unsigned long),
                              unsigned char *output,
-                             int *posp,
+                             long *posp,
                              void(*error)(char *x)
        )
 {
@@ -667,11 +667,11 @@ exit_0:
 }
 
 #ifdef PREBOOT
-STATIC int INIT decompress(unsigned char *buf, int in_len,
-                             int(*fill)(void*, unsigned int),
-                             int(*flush)(void*, unsigned int),
+STATIC int INIT decompress(unsigned char *buf, long in_len,
+                             long (*fill)(void*, unsigned long),
+                             long (*flush)(void*, unsigned long),
                              unsigned char *output,
-                             int *posp,
+                             long *posp,
                              void(*error)(char *x)
        )
 {