summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <sebastian@breakpoint.cc>2009-02-23 22:38:54 +0100
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2009-02-24 11:35:51 +0200
commite6801464b5bb61a5ae3c8ce57493e621f9f6252b (patch)
tree648e1819e394b041b66cdc47c74e8d180f210bf1
parentcca27d4c0819ae244b33639a19bec82cc2895704 (diff)
mkfs.jffs2: fix lzo usage on 64bit systems
the compress size parameter in lzo is defined in the header file as lzo_uint. This looks very much like uint32_t, I know, but is defined as unsigned long. So on 64bit LE systems we zero some bytes near by and on BE systems we get a size of zero. Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-rw-r--r--compr_lzo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/compr_lzo.c b/compr_lzo.c
index a0bb362..3d7dad7 100644
--- a/compr_lzo.c
+++ b/compr_lzo.c
@@ -48,7 +48,7 @@ static void *lzo_compress_buf;
static int jffs2_lzo_cmpr(unsigned char *data_in, unsigned char *cpage_out,
uint32_t *sourcelen, uint32_t *dstlen, void *model)
{
- uint32_t compress_size;
+ lzo_uint compress_size;
int ret;
ret = lzo1x_999_compress(data_in, *sourcelen, lzo_compress_buf, &compress_size, lzo_mem);
@@ -69,7 +69,7 @@ static int jffs2_lzo_decompress(unsigned char *data_in, unsigned char *cpage_out
uint32_t srclen, uint32_t destlen, void *model)
{
int ret;
- uint32_t dl;
+ lzo_uint dl;
ret = lzo1x_decompress_safe(data_in,srclen,cpage_out,&dl,NULL);