From 0393ba6656ce6cf679a2c4663275b3ed0f1a34b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 31 Jul 2014 12:09:49 +0200 Subject: Updated ics-openvpn to rev 859 + no 2nd notification. --- app/lzo/examples/precomp2.c | 45 +++++++++++++-------------------------------- 1 file changed, 13 insertions(+), 32 deletions(-) (limited to 'app/lzo/examples/precomp2.c') diff --git a/app/lzo/examples/precomp2.c b/app/lzo/examples/precomp2.c index d9e1b47b..93dd8b55 100644 --- a/app/lzo/examples/precomp2.c +++ b/app/lzo/examples/precomp2.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 @@ -68,7 +53,7 @@ lzo1x_999_compress_internal ( const lzo_bytep in , lzo_uint in_len, lzo_uint max_lazy, lzo_uint nice_length, lzo_uint max_chain, - lzo_uint32 flags ); + lzo_uint32_t flags ); LZO_EXTERN(int) lzo1y_999_compress_internal ( const lzo_bytep in , lzo_uint in_len, @@ -81,7 +66,7 @@ lzo1y_999_compress_internal ( const lzo_bytep in , lzo_uint in_len, lzo_uint max_lazy, lzo_uint nice_length, lzo_uint max_chain, - lzo_uint32 flags ); + lzo_uint32_t flags ); #define USE_LZO1X 1 #define USE_LZO1Y 1 @@ -108,7 +93,7 @@ int __lzo_cdecl_main main(int argc, char *argv[]) int lazy; const int max_try_lazy = 5; const lzo_uint big = 65536L; /* can result in very slow compression */ - const lzo_uint32 flags = 0x1; + const lzo_uint32_t flags = 0x1; lzo_bytep in; lzo_uint in_len; @@ -118,15 +103,15 @@ int __lzo_cdecl_main main(int argc, char *argv[]) lzo_uint out_len = 0; lzo_voidp wrkmem; - lzo_uint wrk_len; + lzo_uint wrkmem_size; lzo_uint best_len; int best_compress = -1; int best_lazy = -1; lzo_uint orig_len; - lzo_uint32 uncompressed_checksum; - lzo_uint32 compressed_checksum; + lzo_uint32_t uncompressed_checksum; + lzo_uint32_t compressed_checksum; FILE *fp; const char *in_name = NULL; @@ -138,7 +123,7 @@ int __lzo_cdecl_main main(int argc, char *argv[]) printf("\nLZO real-time data compression library (v%s, %s).\n", lzo_version_string(), lzo_version_date()); - printf("Copyright (C) 1996-2011 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); + printf("Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); progname = argv[0]; if (argc < 2 || argc > 3) @@ -162,16 +147,14 @@ int __lzo_cdecl_main main(int argc, char *argv[]) /* * Step 2: allocate the work-memory */ - wrk_len = 1; + wrkmem_size = 1; #ifdef USE_LZO1X - if (wrk_len < LZO1X_999_MEM_COMPRESS) - wrk_len = LZO1X_999_MEM_COMPRESS; + wrkmem_size = (LZO1X_999_MEM_COMPRESS > wrkmem_size) ? LZO1X_999_MEM_COMPRESS : wrkmem_size; #endif #ifdef USE_LZO1Y - if (wrk_len < LZO1Y_999_MEM_COMPRESS) - wrk_len = LZO1Y_999_MEM_COMPRESS; + wrkmem_size = (LZO1Y_999_MEM_COMPRESS > wrkmem_size) ? LZO1Y_999_MEM_COMPRESS : wrkmem_size; #endif - wrkmem = (lzo_voidp) xmalloc(wrk_len); + wrkmem = (lzo_voidp) xmalloc(wrkmem_size); if (wrkmem == NULL) { printf("%s: out of memory\n", progname); @@ -395,7 +378,5 @@ int __lzo_cdecl_main main(int argc, char *argv[]) return 0; } -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ -- cgit v1.2.3