diff options
| author | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-12-23 14:06:25 +0100 |
|---|---|---|
| committer | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-12-23 14:06:25 +0100 |
| commit | 79a9578a33ecd3093970bd18df677edc9214fafb (patch) | |
| tree | 8ae5c6780a1fcd2124e71f27ad9b4256acd24268 /src/lzo_crc.c | |
| parent | 1bb1ce141783168d44a38cd1bb6b822eb13114fc (diff) | |
| download | lzo-79a9578a33ecd3093970bd18df677edc9214fafb.tar.gz lzo-79a9578a33ecd3093970bd18df677edc9214fafb.tar.bz2 lzo-79a9578a33ecd3093970bd18df677edc9214fafb.zip | |
Imported Upstream version 2.08upstream/2.08sandbox/kevinthierry/upstream
Diffstat (limited to 'src/lzo_crc.c')
| -rw-r--r-- | src/lzo_crc.c | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/src/lzo_crc.c b/src/lzo_crc.c index 83941ab..94af1c3 100644 --- a/src/lzo_crc.c +++ b/src/lzo_crc.c @@ -2,19 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -47,7 +35,7 @@ // see http://www.zlib.org/ ************************************************************************/ -static const lzo_uint32 lzo_crc32_table[256] = { +static const lzo_uint32_t lzo_crc32_table[256] = { 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, @@ -103,7 +91,7 @@ static const lzo_uint32 lzo_crc32_table[256] = { }; -LZO_PUBLIC(const lzo_uint32p) +LZO_PUBLIC(const lzo_uint32_tp) lzo_get_crc32_table(void) { return lzo_crc32_table; @@ -112,26 +100,26 @@ lzo_get_crc32_table(void) #if 1 #define LZO_DO1(buf,i) \ - crc = table[((int)crc ^ buf[i]) & 0xff] ^ (crc >> 8) + crc = table[((unsigned)crc ^ buf[i]) & 0xff] ^ (crc >> 8) #else #define LZO_DO1(buf,i) \ crc = table[(unsigned char)((unsigned char)crc ^ buf[i])] ^ (crc >> 8) #endif -#define LZO_DO2(buf,i) LZO_DO1(buf,i); LZO_DO1(buf,i+1); -#define LZO_DO4(buf,i) LZO_DO2(buf,i); LZO_DO2(buf,i+2); -#define LZO_DO8(buf,i) LZO_DO4(buf,i); LZO_DO4(buf,i+4); -#define LZO_DO16(buf,i) LZO_DO8(buf,i); LZO_DO8(buf,i+8); +#define LZO_DO2(buf,i) LZO_DO1(buf,i); LZO_DO1(buf,i+1) +#define LZO_DO4(buf,i) LZO_DO2(buf,i); LZO_DO2(buf,i+2) +#define LZO_DO8(buf,i) LZO_DO4(buf,i); LZO_DO4(buf,i+4) +#define LZO_DO16(buf,i) LZO_DO8(buf,i); LZO_DO8(buf,i+8) -LZO_PUBLIC(lzo_uint32) -lzo_crc32(lzo_uint32 c, const lzo_bytep buf, lzo_uint len) +LZO_PUBLIC(lzo_uint32_t) +lzo_crc32(lzo_uint32_t c, const lzo_bytep buf, lzo_uint len) { - lzo_uint32 crc; + lzo_uint32_t crc; #undef table #if 1 # define table lzo_crc32_table #else - const lzo_uint32 * table = lzo_crc32_table; + const lzo_uint32_t * table = lzo_crc32_table; #endif if (buf == NULL) |