diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/align.c | 38 | ||||
| -rw-r--r-- | tests/chksum.c | 36 | ||||
| -rw-r--r-- | tests/promote.c | 33 | ||||
| -rw-r--r-- | tests/sizes.c | 33 |
4 files changed, 41 insertions, 99 deletions
diff --git a/tests/align.c b/tests/align.c index bc15663..bdb9cab 100644 --- a/tests/align.c +++ b/tests/align.c @@ -2,22 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer - 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 @@ -52,14 +37,14 @@ #include "examples/portab.h" -int opt_verbose = 0; +static int opt_verbose = 0; /************************************************************************* // **************************************************************************/ -unsigned long align_test(lzo_bytep block, lzo_uint len, lzo_uint step) +static unsigned long align_test(lzo_bytep block, lzo_uint len, lzo_uint step) { lzo_bytep b1 = block; lzo_bytep b2 = block; @@ -150,7 +135,7 @@ unsigned long align_test(lzo_bytep block, lzo_uint len, lzo_uint step) // **************************************************************************/ -#define BLOCK_LEN (128*1024ul) +#define BLOCK_SIZE (128*1024ul) int main(int argc, char *argv[]) { @@ -165,7 +150,7 @@ int main(int argc, char *argv[]) printf("lzo_init() failed !!!\n"); return 3; } - buf = (lzo_bytep) lzo_malloc(2*BLOCK_LEN + 256); + buf = (lzo_bytep) lzo_malloc(2*BLOCK_SIZE + 256); if (buf == NULL) { printf("out of memory\n"); @@ -186,16 +171,16 @@ int main(int argc, char *argv[]) unsigned long n; unsigned gap; - gap = __lzo_align_gap(block,step); - block = LZO_PTR_ALIGN_UP(block,step); + gap = __lzo_align_gap(block, step); + block = LZO_PTR_ALIGN_UP(block, step); if (opt_verbose >= 1) printf("STEP %5lu: GAP: %5lu %p %p %5lu\n", (unsigned long) step, (unsigned long) gap, buf, block, (unsigned long) (block - buf)); - n = align_test(block,BLOCK_LEN,step); + n = align_test(block, BLOCK_SIZE, step); if (n == 0) return 1; - if ((n + 1) * step != BLOCK_LEN) + if ((n + 1) * step != BLOCK_SIZE) { printf("error 4: %ld %lu\n", (long)step, n); return 1; @@ -208,7 +193,4 @@ int main(int argc, char *argv[]) } -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/tests/chksum.c b/tests/chksum.c index 7fbcb41..c22afba 100644 --- a/tests/chksum.c +++ b/tests/chksum.c @@ -2,22 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer - 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 @@ -55,8 +40,8 @@ int main(int argc, char *argv[]) { lzo_bytep block; - lzo_uint block_len; - lzo_uint32 adler, crc; + lzo_uint block_size; + lzo_uint32_t adler, crc; if (argc < 0 && argv == NULL) /* avoid warning about unused args */ return 0; @@ -68,18 +53,18 @@ int main(int argc, char *argv[]) } /* prepare the block */ - block_len = 128 * 1024L; - block = (lzo_bytep) lzo_malloc(block_len); + block_size = 128 * 1024L; + block = (lzo_bytep) lzo_malloc(block_size); if (block == NULL) { printf("out of memory\n"); return 3; } - lzo_memset(block, 0, block_len); + lzo_memset(block, 0, block_size); /* adler32 checksum */ adler = lzo_adler32(0, NULL, 0); - adler = lzo_adler32(adler, block, block_len); + adler = lzo_adler32(adler, block, block_size); if (adler != 0x001e0001UL) { printf("adler32 checksum error !!! (0x%08lx)\n", (long) adler); @@ -88,7 +73,7 @@ int main(int argc, char *argv[]) /* crc32 checksum */ crc = lzo_crc32(0, NULL, 0); - crc = lzo_crc32(crc, block, block_len); + crc = lzo_crc32(crc, block, block_size); if (crc != 0x7ee8cdcdUL) { printf("crc32 checksum error !!! (0x%08lx)\n", (long) crc); @@ -101,7 +86,4 @@ int main(int argc, char *argv[]) } -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/tests/promote.c b/tests/promote.c index 21fff2c..30c6da6 100644 --- a/tests/promote.c +++ b/tests/promote.c @@ -2,22 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer - 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 @@ -42,6 +27,11 @@ #include <stdio.h> +#if defined(_MSC_VER) && (_MSC_VER+0 >= 1000) + /* disable "unreachable code" warnings */ +# pragma warning(disable: 4702) +#endif + int main(int argc, char *argv[]) { unsigned char c; @@ -54,10 +44,12 @@ int main(int argc, char *argv[]) s = 8 * (int) (sizeof(int) - sizeof(char)); printf("Integral promotion: "); - if ((c << s) > 0) + { + const int u = (c << s) > 0; + if (u) { printf("Classic C (unsigned-preserving)\n"); - printf("%d %d %uU\n", c, s, c << s); + printf("%d %d %uU\n", c, s, (unsigned)c << s); return 1; } else @@ -66,8 +58,7 @@ int main(int argc, char *argv[]) printf("%d %d %d\n", c, s, c << s); return 0; } + } } -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/tests/sizes.c b/tests/sizes.c index aea8cc2..3840fe2 100644 --- a/tests/sizes.c +++ b/tests/sizes.c @@ -2,22 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer - 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 @@ -59,6 +44,11 @@ #include "lzo/lzoconf.h" #include <stdio.h> +#if (LZO_CC_MSC && (_MSC_VER >= 1300)) + /* disable warning C4310: cast truncates constant value */ +# pragma warning(disable: 4310) +#endif + union _lzo_align1_t { @@ -101,15 +91,15 @@ union _lzo_align6_t #define print_size(type) \ sprintf(s,"sizeof(%s)",#type); \ - printf("%-30s %2d\n", s, (int)sizeof(type)); + printf("%-30s %2ld\n", s, (long)sizeof(type)); #define print_ssize(type,m) \ sprintf(s,"sizeof(%s)",#type); \ - printf("%-30s %2d %20ld\n", s, (int)sizeof(type), (long)(m)); + printf("%-30s %2ld %20ld\n", s, (long)sizeof(type), (long)(m)); #define print_usize(type,m) \ sprintf(s,"sizeof(%s)",#type); \ - printf("%-30s %2d %20lu\n", s, (int)sizeof(type), (unsigned long)(m)); + printf("%-30s %2ld %20lu\n", s, (long)sizeof(type), (unsigned long)(m)); int main(int argc, char *argv[]) @@ -130,7 +120,6 @@ int main(int argc, char *argv[]) printf("\n"); print_ssize(lzo_int,LZO_INT_MAX); print_usize(lzo_uint,LZO_UINT_MAX); - print_usize(lzo_uint32,LZO_UINT32_MAX); print_size(lzo_bytep); printf("\n"); print_size(union _lzo_align1_t); @@ -145,7 +134,5 @@ int main(int argc, char *argv[]) return 0; } -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ |