From 98399ed51045871f8d73599322b6947d6b2b80d0 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Mon, 10 Aug 2015 13:51:40 +0200 Subject: Update lzo to 2.09 --- main/lzo/lzotest/asm.h | 9 +++---- main/lzo/lzotest/db.h | 12 ++------- main/lzo/lzotest/lzotest.c | 61 ++++++++++++--------------------------------- main/lzo/lzotest/wrap.h | 27 ++++++-------------- main/lzo/lzotest/wrapmisc.h | 7 ++---- 5 files changed, 31 insertions(+), 85 deletions(-) (limited to 'main/lzo/lzotest') diff --git a/main/lzo/lzotest/asm.h b/main/lzo/lzotest/asm.h index cbc07156..72b82893 100644 --- a/main/lzo/lzotest/asm.h +++ b/main/lzo/lzotest/asm.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -31,7 +31,7 @@ **************************************************************************/ #if defined(LZO_USE_ASM) -# include "lzo/lzo_asm.h" +# include #else # define lzo1c_decompress_asm 0 # define lzo1c_decompress_asm_safe 0 @@ -64,7 +64,4 @@ #define lzo1f_decompress_asm_safe 0 -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/main/lzo/lzotest/db.h b/main/lzo/lzotest/db.h index 9ce0a6ca..36fc481d 100644 --- a/main/lzo/lzotest/db.h +++ b/main/lzo/lzotest/db.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -473,13 +473,5 @@ zlib_crc32_x_compress, 0, 0, 0, 0, 0, 0, 0 }, #endif -#if defined(__LZO_PROFESSIONAL__) -# include "lzopro/t_db.ch" -#endif - - - -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/main/lzo/lzotest/lzotest.c b/main/lzo/lzotest/lzotest.c index e4359d3e..e4bae0f8 100644 --- a/main/lzo/lzotest/lzotest.c +++ b/main/lzo/lzotest/lzotest.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -26,7 +26,7 @@ */ -#include "lzo/lzoconf.h" +#include /************************************************************************* @@ -90,43 +90,34 @@ /* LZO algorithms */ #if defined(HAVE_LZO1_H) -# include "lzo/lzo1.h" +# include #endif #if defined(HAVE_LZO1A_H) -# include "lzo/lzo1a.h" +# include #endif #if defined(HAVE_LZO1B_H) -# include "lzo/lzo1b.h" +# include #endif #if defined(HAVE_LZO1C_H) -# include "lzo/lzo1c.h" +# include #endif #if defined(HAVE_LZO1F_H) -# include "lzo/lzo1f.h" +# include #endif #if defined(HAVE_LZO1X_H) -# include "lzo/lzo1x.h" -# if defined(__LZO_PROFESSIONAL__) -# include "lzo/lzopro/lzo1x.h" -# endif +# include #endif #if defined(HAVE_LZO1Y_H) -# include "lzo/lzo1y.h" -# if defined(__LZO_PROFESSIONAL__) -# include "lzo/lzopro/lzo1y.h" -# endif +# include #endif #if defined(HAVE_LZO1Z_H) -# include "lzo/lzo1z.h" +# include #endif #if defined(HAVE_LZO2A_H) -# include "lzo/lzo2a.h" +# include #endif #if defined(HAVE_LZO2B_H) -# include "lzo/lzo2b.h" -#endif -#if defined(__LZO_PROFESSIONAL__) -# include "lzopro/t_config.ch" +# include #endif /* other compressors */ #if defined(HAVE_ZLIB_H) @@ -207,10 +198,6 @@ enum { M_Z_CRC32 = 6012, #endif -#if defined(__LZO_PROFESSIONAL__) -# include "lzopro/m_enum.ch" -#endif - M_UNUSED }; @@ -619,7 +606,7 @@ lzo_bool is_compressor ( const compress_t *c ) // check that memory gets accessed within bounds **************************************************************************/ -static void memchecker_init ( mblock_t *mb, lzo_xint l, unsigned char random_byte ) +static void memchecker_init ( mblock_t *mb, lzo_uint l, unsigned char random_byte ) { lzo_uint i; lzo_uint len = (lzo_uint) l; @@ -645,7 +632,7 @@ static void memchecker_init ( mblock_t *mb, lzo_xint l, unsigned char random_byt } -static int memchecker_check ( mblock_t *mb, lzo_xint l, unsigned char random_byte ) +static int memchecker_check ( mblock_t *mb, lzo_uint l, unsigned char random_byte ) { lzo_uint i; lzo_uint len = (lzo_uint) l; @@ -1495,9 +1482,6 @@ void license(void) fp = stdout; fflush(stdout); fflush(stderr); -#if defined(__LZO_PROFESSIONAL__) -# include "lzopro/license.ch" -#else fprintf(fp, " The LZO library is free software; you can redistribute it and/or\n" " modify it under the terms of the GNU General Public License as\n" @@ -1521,7 +1505,6 @@ fprintf(fp, " http://www.oberhumer.com/opensource/lzo/\n" "\n" ); -#endif fflush(fp); exit(EXIT_OK); @@ -1645,9 +1628,6 @@ static void parse_methods(const char *p) #if defined(ALG_BZIP2) else if (m_strcmp(p,"bzip2") == 0) add_all_methods(M_BZIP2_1,M_BZIP2_9); -#endif -#if defined(__LZO_PROFESSIONAL__) -# include "lzopro/t_opt_m.ch" #endif else if (m_strisdigit(p)) add_method(atoi(p)); @@ -1922,15 +1902,9 @@ int __lzo_cdecl_main main(int argc, char *argv[]) if ((*s == '/' || *s == '\\') && s[1]) progname = s + 1; -#if defined(__LZO_PROFESSIONAL__) - printf("\nLZO Professional real-time data compression library (v%s, %s).\n", - lzo_version_string(), lzo_version_date()); - printf("Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); -#else printf("\nLZO real-time data compression library (v%s, %s).\n", lzo_version_string(), lzo_version_date()); - printf("Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); -#endif + printf("Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); /* @@ -2089,7 +2063,4 @@ int __lzo_cdecl_main main(int argc, char *argv[]) } -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/main/lzo/lzotest/wrap.h b/main/lzo/lzotest/wrap.h index e85cd939..d2a9c13a 100644 --- a/main/lzo/lzotest/wrap.h +++ b/main/lzo/lzotest/wrap.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -211,9 +211,9 @@ memcpy_x_compress ( const lzo_bytep src, lzo_uint src_len, lzo_bytep dst, lzo_uintp dst_len, lzo_voidp wrkmem ) { - lzo_memcpy(dst,src,src_len); + lzo_memcpy(dst, src, src_len); *dst_len = src_len; - if (wrkmem) wrkmem = 0; /* avoid warning */ + LZO_UNUSED(wrkmem); return 0; } @@ -223,10 +223,9 @@ memset_x_compress ( const lzo_bytep src, lzo_uint src_len, lzo_bytep dst, lzo_uintp dst_len, lzo_voidp wrkmem ) { - lzo_memset(dst,0,src_len); + lzo_memset(dst, 0, src_len); *dst_len = src_len; - if (src) src = 0; /* avoid warning */ - if (wrkmem) wrkmem = 0; /* avoid warning */ + LZO_UNUSED(src); LZO_UNUSED(wrkmem); return 0; } @@ -240,8 +239,7 @@ adler32_x_compress ( const lzo_bytep src, lzo_uint src_len, adler = lzo_adler32(0, NULL, 0); adler = lzo_adler32(adler, dst, src_len); *dst_len = src_len; - if (src) src = 0; /* avoid warning */ - if (wrkmem) wrkmem = 0; /* avoid warning */ + LZO_UNUSED(src); LZO_UNUSED(wrkmem); return 0; } @@ -255,18 +253,9 @@ crc32_x_compress ( const lzo_bytep src, lzo_uint src_len, crc = lzo_crc32(0, NULL, 0); crc = lzo_crc32(crc, dst, src_len); *dst_len = src_len; - if (src) src = 0; /* avoid warning */ - if (wrkmem) wrkmem = 0; /* avoid warning */ + LZO_UNUSED(src); LZO_UNUSED(wrkmem); return 0; } -#if defined(__LZO_PROFESSIONAL__) -# include "lzopro/t_wrap.ch" -#endif - - -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/main/lzo/lzotest/wrapmisc.h b/main/lzo/lzotest/wrapmisc.h index dfcb9187..12c48091 100644 --- a/main/lzo/lzotest/wrapmisc.h +++ b/main/lzo/lzotest/wrapmisc.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -270,7 +270,4 @@ zlib_crc32_x_compress ( const m_bytep src, m_uint src_len, #endif /* ALG_ZLIB */ -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ -- cgit v1.2.3