aboutsummaryrefslogtreecommitdiffstats
path: root/lib/lzo
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-07-31 00:37:42 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-31 15:39:37 -0700
commitc21b37f6449a3d799c7e75e978391674ee207600 (patch)
tree556444c66fdd75cb91dce1bdd9cc8db9c2be074c /lib/lzo
parent3968cb49ab01588cbf6896951780a1e411a0ec38 (diff)
downloadkernel_samsung_tuna-c21b37f6449a3d799c7e75e978391674ee207600.zip
kernel_samsung_tuna-c21b37f6449a3d799c7e75e978391674ee207600.tar.gz
kernel_samsung_tuna-c21b37f6449a3d799c7e75e978391674ee207600.tar.bz2
lzo: add some missing casts
Add some casts to the LZO compression algorithm after they were removed during cleanup and shouldn't have been. Signed-off-by: Richard Purdie <rpurdie@openedhand.com> Cc: Edward Shishkin <edward@namesys.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib/lzo')
-rw-r--r--lib/lzo/lzo1x_compress.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/lzo/lzo1x_compress.c b/lib/lzo/lzo1x_compress.c
index c935f00..a604099 100644
--- a/lib/lzo/lzo1x_compress.c
+++ b/lib/lzo/lzo1x_compress.c
@@ -32,13 +32,13 @@ _lzo1x_1_do_compress(const unsigned char *in, size_t in_len,
ip += 4;
for (;;) {
- dindex = ((0x21 * DX3(ip, 5, 5, 6)) >> 5) & D_MASK;
+ dindex = ((size_t)(0x21 * DX3(ip, 5, 5, 6)) >> 5) & D_MASK;
m_pos = dict[dindex];
if (m_pos < in)
goto literal;
- if (ip == m_pos || (ip - m_pos) > M4_MAX_OFFSET)
+ if (ip == m_pos || ((size_t)(ip - m_pos) > M4_MAX_OFFSET))
goto literal;
m_off = ip - m_pos;
@@ -51,7 +51,7 @@ _lzo1x_1_do_compress(const unsigned char *in, size_t in_len,
if (m_pos < in)
goto literal;
- if (ip == m_pos || (ip - m_pos) > M4_MAX_OFFSET)
+ if (ip == m_pos || ((size_t)(ip - m_pos) > M4_MAX_OFFSET))
goto literal;
m_off = ip - m_pos;