diff options
| author | Yann Collet <yann.collet.73@gmail.com> | 2015-04-15 09:34:08 (GMT) |
|---|---|---|
| committer | Yann Collet <yann.collet.73@gmail.com> | 2015-04-15 09:34:08 (GMT) |
| commit | 4e574e7395323d7fe0edb4313d79d5ab3b2607ae (patch) | |
| tree | 7fcdf9e8353f205a9a41f567fa35ef988739af44 /programs | |
| parent | d37926b0b58b2eaae972946713b92d7c8bb8621f (diff) | |
| download | lz4-4e574e7395323d7fe0edb4313d79d5ab3b2607ae.zip lz4-4e574e7395323d7fe0edb4313d79d5ab3b2607ae.tar.gz lz4-4e574e7395323d7fe0edb4313d79d5ab3b2607ae.tar.bz2 | |
Updated lz4frame error names
Diffstat (limited to 'programs')
| -rw-r--r-- | programs/Makefile | 4 | ||||
| -rw-r--r-- | programs/frametest.c | 3 | ||||
| -rw-r--r-- | programs/lz4.1 | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/programs/Makefile b/programs/Makefile index 6008c7b..7bbe060 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -226,10 +226,10 @@ test-lz4c32: lz4 lz4c32 datagen ./datagen -g6GB | ./lz4c32 -vq9BD | ./lz4 -qt test-fullbench: fullbench - ./fullbench --no-prompt $(TEST_FILES) + ./fullbench --no-prompt $(NB_LOOPS) $(TEST_FILES) test-fullbench32: fullbench32 - ./fullbench32 --no-prompt $(TEST_FILES) + ./fullbench32 --no-prompt $(NB_LOOPS) $(TEST_FILES) test-fuzzer: fuzzer ./fuzzer $(FUZZER_TIME) diff --git a/programs/frametest.c b/programs/frametest.c index 8a51be8..6adf408 100644 --- a/programs/frametest.c +++ b/programs/frametest.c @@ -678,7 +678,8 @@ int fuzzerTests(U32 seed, unsigned nbTests, unsigned startTest, double compressi dOptions.stableDst = FUZ_rand(&randState) & 1; if (nonContiguousDst==2) dOptions.stableDst = 0; result = LZ4F_decompress(dCtx, op, &oSize, ip, &iSize, &dOptions); - if (result == (size_t)-ERROR_checksum_invalid) locateBuffDiff((BYTE*)srcBuffer+srcStart, decodedBuffer, srcSize, nonContiguousDst); + if (result == (size_t)-LZ4F_ERROR_contentChecksum_invalid) + locateBuffDiff((BYTE*)srcBuffer+srcStart, decodedBuffer, srcSize, nonContiguousDst); CHECK(LZ4F_isError(result), "Decompression failed (error %i:%s)", (int)result, LZ4F_getErrorName((LZ4F_errorCode_t)result)); XXH64_update(&xxh64, op, (U32)oSize); totalOut += oSize; diff --git a/programs/lz4.1 b/programs/lz4.1 index eea248f..a9b5195 100644 --- a/programs/lz4.1 +++ b/programs/lz4.1 @@ -177,12 +177,12 @@ independently, and the resulting name of the compressed file will be block dependency (improve compression ratio) .TP .B \--[no-]frame-crc - disable stream checksum (default:enabled) + select frame checksum (default:enabled) .TP .B \--[no-]content-size - compressed file includes original size (default:not present) + header includes original size (default:not present) Note : this option can only be activated when the original size can be determined, -hence for a file. It won't work with unknown source size, such as stdin pipe. +hence for a file. It won't work with unknown source size, such as stdin or pipe. .TP .B \--[no-]sparse enable sparse file (default:disabled)(experimental) |