diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-07-31 03:37:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 18:39:37 -0400 |
| commit | c21b37f6449a3d799c7e75e978391674ee207600 (patch) | |
| tree | 556444c66fdd75cb91dce1bdd9cc8db9c2be074c /lib/lzo | |
| parent | 3968cb49ab01588cbf6896951780a1e411a0ec38 (diff) | |
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/lzo/lzo1x_compress.c b/lib/lzo/lzo1x_compress.c index c935f00073e9..a6040990a62e 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, | |||
| 32 | ip += 4; | 32 | ip += 4; |
| 33 | 33 | ||
| 34 | for (;;) { | 34 | for (;;) { |
| 35 | dindex = ((0x21 * DX3(ip, 5, 5, 6)) >> 5) & D_MASK; | 35 | dindex = ((size_t)(0x21 * DX3(ip, 5, 5, 6)) >> 5) & D_MASK; |
| 36 | m_pos = dict[dindex]; | 36 | m_pos = dict[dindex]; |
| 37 | 37 | ||
| 38 | if (m_pos < in) | 38 | if (m_pos < in) |
| 39 | goto literal; | 39 | goto literal; |
| 40 | 40 | ||
| 41 | if (ip == m_pos || (ip - m_pos) > M4_MAX_OFFSET) | 41 | if (ip == m_pos || ((size_t)(ip - m_pos) > M4_MAX_OFFSET)) |
| 42 | goto literal; | 42 | goto literal; |
| 43 | 43 | ||
| 44 | m_off = ip - m_pos; | 44 | m_off = ip - m_pos; |
| @@ -51,7 +51,7 @@ _lzo1x_1_do_compress(const unsigned char *in, size_t in_len, | |||
| 51 | if (m_pos < in) | 51 | if (m_pos < in) |
| 52 | goto literal; | 52 | goto literal; |
| 53 | 53 | ||
| 54 | if (ip == m_pos || (ip - m_pos) > M4_MAX_OFFSET) | 54 | if (ip == m_pos || ((size_t)(ip - m_pos) > M4_MAX_OFFSET)) |
| 55 | goto literal; | 55 | goto literal; |
| 56 | 56 | ||
| 57 | m_off = ip - m_pos; | 57 | m_off = ip - m_pos; |