Fixes:
lib/uncompress.c:124:10: warning: assignment from incompatible pointer type
Signed-off-by: Lucas Stach <l.stach@xxxxxxxxxxxxxx>
---
include/linux/xz.h | 8 ++++----
lib/decompress_unxz.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/linux/xz.h b/include/linux/xz.h
index a3c2b7766ae1..d1afab056242 100644
--- a/include/linux/xz.h
+++ b/include/linux/xz.h
@@ -262,10 +262,10 @@ XZ_EXTERN void xz_crc32_init(void);
XZ_EXTERN uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc);
#endif
-STATIC int decompress_unxz(unsigned char *in, long in_size,
- long (*fill)(void *dest, unsigned long size),
- long (*flush)(void *src, unsigned long size),
- unsigned char *out, long *in_used,
+STATIC int decompress_unxz(unsigned char *in, int in_size,
+ int (*fill)(void *dest, unsigned int size),
+ int (*flush)(void *src, unsigned int size),
+ unsigned char *out, int *in_used,
void (*error)(char *x));
#endif
diff --git a/lib/decompress_unxz.c b/lib/decompress_unxz.c
index 0b6bc834ad56..1ddcee38ee89 100644
--- a/lib/decompress_unxz.c
+++ b/lib/decompress_unxz.c
@@ -227,10 +227,10 @@ static void memzero(void *buf, size_t size)
* both input and output buffers are available as a single chunk, i.e. when
* fill() and flush() won't be used.
*/
-STATIC int decompress_unxz(unsigned char *in, long in_size,
- long (*fill)(void *dest, unsigned long size),
- long (*flush)(void *src, unsigned long size),
- unsigned char *out, long *in_used,
+STATIC int decompress_unxz(unsigned char *in, int in_size,
+ int (*fill)(void *dest, unsigned int size),
+ int (*flush)(void *src, unsigned int size),
+ unsigned char *out, int *in_used,
void (*error)(char *x))
{
struct xz_buf b;
--
2.1.1
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
