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/examples/dict.c | 8 ++++---- main/lzo/examples/lzopack.c | 20 ++++++++++---------- main/lzo/examples/overlap.c | 8 ++++---- main/lzo/examples/portab.h | 4 ++-- main/lzo/examples/portab_a.h | 2 +- main/lzo/examples/precomp.c | 10 +++++----- main/lzo/examples/precomp2.c | 10 +++++----- main/lzo/examples/simple.c | 10 +++++----- 8 files changed, 36 insertions(+), 36 deletions(-) (limited to 'main/lzo/examples') diff --git a/main/lzo/examples/dict.c b/main/lzo/examples/dict.c index 3ccc9a53..5d8ca62c 100644 --- a/main/lzo/examples/dict.c +++ b/main/lzo/examples/dict.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 @@ -32,8 +32,8 @@ // Please study LZO.FAQ and simple.c first. **************************************************************************/ -#include "lzo/lzoconf.h" -#include "lzo/lzo1x.h" +#include +#include /* portability layer */ static const char *progname = NULL; @@ -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-2014 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); + printf("Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); progname = argv[0]; diff --git a/main/lzo/examples/lzopack.c b/main/lzo/examples/lzopack.c index 10e2c1dc..c01b47dc 100644 --- a/main/lzo/examples/lzopack.c +++ b/main/lzo/examples/lzopack.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 @@ -36,8 +36,8 @@ // Please study LZO.FAQ and simple.c first. **************************************************************************/ -#include "lzo/lzoconf.h" -#include "lzo/lzo1x.h" +#include +#include /* portability layer */ static const char *progname = NULL; @@ -68,12 +68,12 @@ static lzo_uint xread(FILE *fp, lzo_voidp buf, lzo_uint len, lzo_bool allow_eof) l = (lzo_uint) lzo_fread(fp, buf, len); if (l > len) { - fprintf(stderr, "\nsomething's wrong with your C library !!!\n"); + fprintf(stderr, "\n%s: internal error - something is wrong with your C library !!!\n", progname); exit(1); } if (l != len && !allow_eof) { - fprintf(stderr, "\nread error - premature end of file\n"); + fprintf(stderr, "\n%s: read error - premature end of file\n", progname); exit(1); } total_in += (unsigned long) l; @@ -84,7 +84,7 @@ static lzo_uint xwrite(FILE *fp, const lzo_voidp buf, lzo_uint len) { if (fp != NULL && lzo_fwrite(fp, buf, len) != len) { - fprintf(stderr, "\nwrite error (disk full ?)\n"); + fprintf(stderr, "\n%s: write error (disk full ?)\n", progname); exit(1); } total_out += (unsigned long) len; @@ -120,7 +120,7 @@ static lzo_uint32_t xread32(FILE *fp) return v; } -static void xwrite32(FILE *fp, lzo_xint v) +static void xwrite32(FILE *fp, lzo_uint v) { unsigned char b[4]; @@ -274,7 +274,7 @@ static int do_decompress(FILE *fi, FILE *fo) /* * Step 1: check magic header, read flags & block size, init checksum */ - if (xread(fi, m, sizeof(magic),1) != sizeof(magic) || + if (xread(fi, m, sizeof(magic), 1) != sizeof(magic) || memcmp(m, magic, sizeof(magic)) != 0) { printf("%s: header error - this file is not compressed by lzopack\n", progname); @@ -299,7 +299,7 @@ static int do_decompress(FILE *fi, FILE *fo) r = 3; goto err; } - checksum = lzo_adler32(0,NULL,0); + checksum = lzo_adler32(0, NULL, 0); /* * Step 2: allocate buffer for in-place decompression @@ -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-2014 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); + printf("Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); #if 0 printf( diff --git a/main/lzo/examples/overlap.c b/main/lzo/examples/overlap.c index 114fe3b4..215e055e 100644 --- a/main/lzo/examples/overlap.c +++ b/main/lzo/examples/overlap.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 @@ -33,8 +33,8 @@ // Please study LZO.FAQ and simple.c first. **************************************************************************/ -#include "lzo/lzoconf.h" -#include "lzo/lzo1x.h" +#include +#include /* portability layer */ static const char *progname = NULL; @@ -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-2014 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); + printf("Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); progname = argv[0]; if (i < argc && argv[i][0] == '-') diff --git a/main/lzo/examples/portab.h b/main/lzo/examples/portab.h index d8217ed3..3c220689 100644 --- a/main/lzo/examples/portab.h +++ b/main/lzo/examples/portab.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 @@ -26,7 +26,7 @@ */ -#include "lzo/lzoconf.h" +#include #if (LZO_CC_MSC && (_MSC_VER >= 1000 && _MSC_VER < 1200)) /* avoid '-W4' warnings in system header files */ diff --git a/main/lzo/examples/portab_a.h b/main/lzo/examples/portab_a.h index a3fbec90..57ff4445 100644 --- a/main/lzo/examples/portab_a.h +++ b/main/lzo/examples/portab_a.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 diff --git a/main/lzo/examples/precomp.c b/main/lzo/examples/precomp.c index 01b1e77f..dafd3ea2 100644 --- a/main/lzo/examples/precomp.c +++ b/main/lzo/examples/precomp.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 @@ -35,9 +35,9 @@ // the algorithm that achieves the best compression ratio. **************************************************************************/ -#include "lzo/lzoconf.h" -#include "lzo/lzo1x.h" -#include "lzo/lzo1y.h" +#include +#include +#include #define USE_LZO1X 1 #define USE_LZO1Y 1 @@ -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-2014 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); + printf("Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); progname = argv[0]; if (argc < 2 || argc > 3) diff --git a/main/lzo/examples/precomp2.c b/main/lzo/examples/precomp2.c index 93dd8b55..6c359b93 100644 --- a/main/lzo/examples/precomp2.c +++ b/main/lzo/examples/precomp2.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 @@ -38,9 +38,9 @@ // NOTE: this program can be quite slow for highly redundant files **************************************************************************/ -#include "lzo/lzoconf.h" -#include "lzo/lzo1x.h" -#include "lzo/lzo1y.h" +#include +#include +#include LZO_EXTERN(int) lzo1x_999_compress_internal ( const lzo_bytep in , lzo_uint in_len, @@ -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-2014 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); + printf("Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); progname = argv[0]; if (argc < 2 || argc > 3) diff --git a/main/lzo/examples/simple.c b/main/lzo/examples/simple.c index 42f814a7..9ebfa971 100644 --- a/main/lzo/examples/simple.c +++ b/main/lzo/examples/simple.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 @@ -34,11 +34,11 @@ **************************************************************************/ /* We will be using the LZO1X-1 algorithm, so we have - * to include + * to include */ -#include "lzo/lzoconf.h" -#include "lzo/lzo1x.h" +#include +#include /* portability layer */ static const char *progname = NULL; @@ -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-2014 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); + printf("Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n"); /* * Step 1: initialize the LZO library -- cgit v1.2.3