diff options
author | Yann Collet <cyan@fb.com> | 2017-08-15 23:57:00 (GMT) |
---|---|---|
committer | Yann Collet <cyan@fb.com> | 2017-08-15 23:57:00 (GMT) |
commit | a1f3a27e9b3caf42d31100f96bbb88866e08a517 (patch) | |
tree | 014922fceee22f63d46a0d04328234c3711f4799 /programs | |
parent | 01cdbfb5feda4adee65cc3da04b426c0c22368a3 (diff) | |
parent | af9d72b7f6809ec972787c446d464a8f9be443ba (diff) | |
download | lz4-a1f3a27e9b3caf42d31100f96bbb88866e08a517.zip lz4-a1f3a27e9b3caf42d31100f96bbb88866e08a517.tar.gz lz4-a1f3a27e9b3caf42d31100f96bbb88866e08a517.tar.bz2 |
Merge branch 'dev' into installVars and fixed conflicts
Diffstat (limited to 'programs')
-rw-r--r-- | programs/lz4cli.c | 2 | ||||
-rw-r--r-- | programs/lz4io.c | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/programs/lz4cli.c b/programs/lz4cli.c index 0cabc27..b4a3c14 100644 --- a/programs/lz4cli.c +++ b/programs/lz4cli.c @@ -138,7 +138,7 @@ static int usage_advanced(const char* exeName) DISPLAY( " -l : compress using Legacy format (Linux kernel compression)\n"); DISPLAY( " -B# : Block size [4-7] (default : 7) \n"); DISPLAY( " -BD : Block dependency (improve compression ratio) \n"); - /* DISPLAY( " -BX : enable block checksum (default:disabled)\n"); *//* Option currently inactive */ + DISPLAY( " -BX : enable block checksum (default:disabled) \n"); DISPLAY( "--no-frame-crc : disable stream checksum (default:enabled) \n"); DISPLAY( "--content-size : compressed frame includes original size (default:not present)\n"); DISPLAY( "--[no-]sparse : sparse mode (default:enabled on file, disabled on stdout)\n"); diff --git a/programs/lz4io.c b/programs/lz4io.c index 1e6b437..06741b4 100644 --- a/programs/lz4io.c +++ b/programs/lz4io.c @@ -173,17 +173,17 @@ int LZ4IO_setBlockMode(LZ4IO_blockMode_t blockMode) return g_blockIndependence; } -/* Default setting : no checksum */ -int LZ4IO_setBlockChecksumMode(int xxhash) +/* Default setting : no block checksum */ +int LZ4IO_setBlockChecksumMode(int enable) { - g_blockChecksum = (xxhash != 0); + g_blockChecksum = (enable != 0); return g_blockChecksum; } /* Default setting : checksum enabled */ -int LZ4IO_setStreamChecksumMode(int xxhash) +int LZ4IO_setStreamChecksumMode(int enable) { - g_streamChecksum = (xxhash != 0); + g_streamChecksum = (enable != 0); return g_streamChecksum; } @@ -455,6 +455,7 @@ static int LZ4IO_compressFilename_extRess(cRess_t ress, const char* srcFileName, prefs.compressionLevel = compressionLevel; prefs.frameInfo.blockMode = (LZ4F_blockMode_t)g_blockIndependence; prefs.frameInfo.blockSizeID = (LZ4F_blockSizeID_t)g_blockSizeId; + prefs.frameInfo.blockChecksumFlag = (LZ4F_blockChecksum_t)g_blockChecksum; prefs.frameInfo.contentChecksumFlag = (LZ4F_contentChecksum_t)g_streamChecksum; if (g_contentSizeFlag) { U64 const fileSize = UTIL_getFileSize(srcFileName); |