diff options
author | Yann Collet <yann.collet.73@gmail.com> | 2014-04-15 13:03:17 (GMT) |
---|---|---|
committer | Yann Collet <yann.collet.73@gmail.com> | 2014-04-15 13:03:17 (GMT) |
commit | 374d6ac35cf784481d60634e9b8e6ca8be7c9302 (patch) | |
tree | 7b93197974bf7e5a3b84af9c262d3c62a1e0f527 /programs | |
parent | 37be46701a21e554fff47f97b549fb473f6a2904 (diff) | |
download | lz4-374d6ac35cf784481d60634e9b8e6ca8be7c9302.zip lz4-374d6ac35cf784481d60634e9b8e6ca8be7c9302.tar.gz lz4-374d6ac35cf784481d60634e9b8e6ca8be7c9302.tar.bz2 |
Fixed issue 127 & 128
Diffstat (limited to 'programs')
-rw-r--r-- | programs/bench.c | 2 | ||||
-rw-r--r-- | programs/bench.h | 2 | ||||
-rw-r--r-- | programs/fullbench.c | 8 | ||||
-rw-r--r-- | programs/lz4cli.c | 6 | ||||
-rw-r--r-- | programs/lz4io.c | 2 | ||||
-rw-r--r-- | programs/lz4io.h | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/programs/bench.c b/programs/bench.c index 2eabf61..8d68098 100644 --- a/programs/bench.c +++ b/programs/bench.c @@ -1,6 +1,6 @@ /* bench.c - Demo program to benchmark open-source compression algorithm - Copyright (C) Yann Collet 2012-2013 + Copyright (C) Yann Collet 2012-2014 GPL v2 License This program is free software; you can redistribute it and/or modify diff --git a/programs/bench.h b/programs/bench.h index ed801d4..a0b7ed2 100644 --- a/programs/bench.h +++ b/programs/bench.h @@ -1,6 +1,6 @@ /* bench.h - Demo program to benchmark open-source compression algorithm - Copyright (C) Yann Collet 2012-2013 + Copyright (C) Yann Collet 2012-2014 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/programs/fullbench.c b/programs/fullbench.c index 8e87019..19d10ba 100644 --- a/programs/fullbench.c +++ b/programs/fullbench.c @@ -1,6 +1,6 @@ /* bench.c - Demo program to benchmark open-source compression algorithm - Copyright (C) Yann Collet 2012-2013 + Copyright (C) Yann Collet 2012-2014 GPL v2 License This program is free software; you can redistribute it and/or modify @@ -281,12 +281,12 @@ static inline int local_LZ4_compress_limitedOutput_continue(const char* in, char static void* stateLZ4HC; static inline int local_LZ4_compressHC_withStateHC(const char* in, char* out, int inSize) { - return LZ4_compress_withState(stateLZ4HC, in, out, inSize); + return LZ4_compressHC_withStateHC(stateLZ4HC, in, out, inSize); } static inline int local_LZ4_compressHC_limitedOutput_withStateHC(const char* in, char* out, int inSize) { - return LZ4_compress_limitedOutput_withState(stateLZ4HC, in, out, inSize, LZ4_compressBound(inSize)); + return LZ4_compressHC_limitedOutput_withStateHC(stateLZ4HC, in, out, inSize, LZ4_compressBound(inSize)); } static inline int local_LZ4_compressHC_limitedOutput(const char* in, char* out, int inSize) @@ -627,7 +627,7 @@ int usage_advanced() { DISPLAY( "\nAdvanced options :\n"); DISPLAY( " -c# : test only compression function # [%c-%c]\n", MINCOMPRESSIONCHAR, MAXCOMPRESSIONCHAR); - DISPLAY( " -d# : test only compression function # [%c-%c]\n", MINDECOMPRESSIONCHAR, MAXDECOMPRESSIONCHAR); + DISPLAY( " -d# : test only decompression function # [%c-%c]\n", MINDECOMPRESSIONCHAR, MAXDECOMPRESSIONCHAR); DISPLAY( " -i# : iteration loops [1-9](default : %i)\n", NBLOOPS); DISPLAY( " -B# : Block size [4-7](default : 7)\n"); //DISPLAY( " -BD : Block dependency (improve compression ratio)\n"); diff --git a/programs/lz4cli.c b/programs/lz4cli.c index fc5bd81..934c2bb 100644 --- a/programs/lz4cli.c +++ b/programs/lz4cli.c @@ -1,6 +1,6 @@ /* LZ4cli.c - LZ4 Command Line Interface - Copyright (C) Yann Collet 2011-2013 + Copyright (C) Yann Collet 2011-2014 GPL v2 License This program is free software; you can redistribute it and/or modify @@ -407,11 +407,11 @@ int main(int argc, char** argv) int B = argument[1] - '0'; int S = 1 << (8 + 2*B); BMK_SetBlocksize(S); - LZ4IO_setBlockSizeID(B); + blockSize = LZ4IO_setBlockSizeID(B); argument++; break; } - case 'D': LZ4IO_setBlockMode(independentBlocks); argument++; break; + case 'D': LZ4IO_setBlockMode(chainedBlocks); argument++; break; case 'X': LZ4IO_setBlockChecksumMode(1); argument ++; break; default : exitBlockProperties=1; } diff --git a/programs/lz4io.c b/programs/lz4io.c index ae8b776..05955cf 100644 --- a/programs/lz4io.c +++ b/programs/lz4io.c @@ -1,6 +1,6 @@ /* LZ4io.c - LZ4 File/Stream Interface - Copyright (C) Yann Collet 2011-2013 + Copyright (C) Yann Collet 2011-2014 GPL v2 License This program is free software; you can redistribute it and/or modify diff --git a/programs/lz4io.h b/programs/lz4io.h index cb35ec0..9c3b217 100644 --- a/programs/lz4io.h +++ b/programs/lz4io.h @@ -1,6 +1,6 @@ /* LZ4io.h - LZ4 File/Stream Interface - Copyright (C) Yann Collet 2011-2013 + Copyright (C) Yann Collet 2011-2014 GPL v2 License This program is free software; you can redistribute it and/or modify |