summaryrefslogtreecommitdiff
path: root/app/lzo/tests
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-07-31 12:09:49 +0200
committerParménides GV <parmegv@sdf.org>2014-07-31 12:09:49 +0200
commit0393ba6656ce6cf679a2c4663275b3ed0f1a34b9 (patch)
treef000311e97598ab3fc42e2bea23e6cb342ad166c /app/lzo/tests
parentb28eeb08e8ec3baafdd9388cc5b70c6c84db9cf1 (diff)
Updated ics-openvpn to rev 859 + no 2nd notification.
Diffstat (limited to 'app/lzo/tests')
-rw-r--r--app/lzo/tests/align.c26
-rw-r--r--app/lzo/tests/chksum.c24
-rw-r--r--app/lzo/tests/promote.c33
-rw-r--r--app/lzo/tests/sizes.c33
4 files changed, 29 insertions, 87 deletions
diff --git a/app/lzo/tests/align.c b/app/lzo/tests/align.c
index bc15663d..a4c5f7db 100644
--- a/app/lzo/tests/align.c
+++ b/app/lzo/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;
@@ -208,7 +193,4 @@ int main(int argc, char *argv[])
}
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/app/lzo/tests/chksum.c b/app/lzo/tests/chksum.c
index 7fbcb417..bb5b502b 100644
--- a/app/lzo/tests/chksum.c
+++ b/app/lzo/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
@@ -56,7 +41,7 @@ int main(int argc, char *argv[])
{
lzo_bytep block;
lzo_uint block_len;
- lzo_uint32 adler, crc;
+ lzo_uint32_t adler, crc;
if (argc < 0 && argv == NULL) /* avoid warning about unused args */
return 0;
@@ -101,7 +86,4 @@ int main(int argc, char *argv[])
}
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/app/lzo/tests/promote.c b/app/lzo/tests/promote.c
index 21fff2c4..30c6da60 100644
--- a/app/lzo/tests/promote.c
+++ b/app/lzo/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/app/lzo/tests/sizes.c b/app/lzo/tests/sizes.c
index aea8cc2e..3840fe2a 100644
--- a/app/lzo/tests/sizes.c
+++ b/app/lzo/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: */