From 57de6cacd32854c3b7942dde1803894341f78cee Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Thu, 22 Jun 2017 16:59:51 +0900 Subject: Imported Upstream version 2.10 Change-Id: Ic72ac9c6134dff3a335d581378095e0011abcb08 Signed-off-by: DongHun Kwak --- examples/dict.c | 6 +++--- examples/lzopack.c | 4 ++-- examples/overlap.c | 4 ++-- examples/portab.h | 7 +++++-- examples/portab_a.h | 2 +- examples/precomp.c | 4 ++-- examples/precomp2.c | 4 ++-- examples/simple.c | 4 ++-- 8 files changed, 19 insertions(+), 16 deletions(-) (limited to 'examples') diff --git a/examples/dict.c b/examples/dict.c index 5d8ca62..8945caf 100644 --- a/examples/dict.c +++ b/examples/dict.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -133,7 +133,7 @@ static int do_file(const char *in_name, int compression_level) /* * Step 3: compress from 'in' to 'out' with LZO1X-999 */ - r = lzo1x_999_compress_level(in,in_len,out,&out_len,wrkmem, + r = lzo1x_999_compress_level(in, in_len, out, &out_len, wrkmem, dict, dict_len, 0, compression_level); if (r != LZO_E_OK) { @@ -192,7 +192,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-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); + printf("Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); progname = argv[0]; diff --git a/examples/lzopack.c b/examples/lzopack.c index c01b47d..91c0c1a 100644 --- a/examples/lzopack.c +++ b/examples/lzopack.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -509,7 +509,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-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); + printf("Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); #if 0 printf( diff --git a/examples/overlap.c b/examples/overlap.c index 215e055..3ff4d18 100644 --- a/examples/overlap.c +++ b/examples/overlap.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -259,7 +259,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-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); + printf("Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); progname = argv[0]; if (i < argc && argv[i][0] == '-') diff --git a/examples/portab.h b/examples/portab.h index 3c22068..93db56a 100644 --- a/examples/portab.h +++ b/examples/portab.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -39,7 +39,9 @@ # pragma warning(disable: 4710 4711) #endif /* disable silly warnings about using "deprecated" POSIX functions like "fopen" */ -#if (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 1100)) +#if (LZO_CC_CLANG_MSC && LZO_CC_CLANG >= 0x030500) +# pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 1100)) # pragma warning(disable: 1786) #elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 1000)) # pragma warning(disable: 1478) @@ -131,6 +133,7 @@ static lzo_voidp xmalloc(lzo_uint len) if (len >= align && __lzo_align_gap(p, align) != 0) { printf("%s: C library problem: malloc() returned misaligned pointer!\n", progname); + lzo_free(p); exit(1); } return p; diff --git a/examples/portab_a.h b/examples/portab_a.h index 57ff444..6484197 100644 --- a/examples/portab_a.h +++ b/examples/portab_a.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/examples/precomp.c b/examples/precomp.c index dafd3ea..e61b0c1 100644 --- a/examples/precomp.c +++ b/examples/precomp.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -89,7 +89,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-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); + printf("Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); progname = argv[0]; if (argc < 2 || argc > 3) diff --git a/examples/precomp2.c b/examples/precomp2.c index 6c359b9..3216cd9 100644 --- a/examples/precomp2.c +++ b/examples/precomp2.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -123,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-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); + printf("Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); progname = argv[0]; if (argc < 2 || argc > 3) diff --git a/examples/simple.c b/examples/simple.c index 9ebfa97..5757e0c 100644 --- a/examples/simple.c +++ b/examples/simple.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -78,7 +78,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-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); + printf("Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); /* * Step 1: initialize the LZO library -- cgit v1.2.3