diff options
| author | Yann Collet <yann.collet.73@gmail.com> | 2015-03-29 21:51:43 (GMT) |
|---|---|---|
| committer | Yann Collet <yann.collet.73@gmail.com> | 2015-03-29 21:51:43 (GMT) |
| commit | 987e78c291063c2ed79fbbe71237576c3e5be0f5 (patch) | |
| tree | 90ce83e8949d054b336aaffc72f7463b2dfab3f8 /programs | |
| parent | 2d4fed5ed2a8e0231f98d79699d28af0142d0099 (diff) | |
| parent | 8cb06d5b9922b16854b05081ce829c223a8129fd (diff) | |
| download | lz4-987e78c291063c2ed79fbbe71237576c3e5be0f5.zip lz4-987e78c291063c2ed79fbbe71237576c3e5be0f5.tar.gz lz4-987e78c291063c2ed79fbbe71237576c3e5be0f5.tar.bz2 | |
Merge pull request #66 from Cyan4973/dev
Dev
Diffstat (limited to 'programs')
| -rw-r--r-- | programs/frametest.c | 10 | ||||
| -rw-r--r-- | programs/lz4io.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/programs/frametest.c b/programs/frametest.c index 2a087ec..96d5acb 100644 --- a/programs/frametest.c +++ b/programs/frametest.c @@ -402,7 +402,7 @@ int basicTests(U32 seed, double compressibility) DISPLAYLEVEL(3, "Compressed %i bytes into a %i bytes frame \n", (int)testSize, (int)(op-ostart)); DISPLAYLEVEL(3, "compress with frameSize : \n"); - prefs.frameInfo.frameOSize = testSize; + prefs.frameInfo.contentSize = testSize; op = ostart; errorCode = LZ4F_compressBegin(cctx, compressedBuffer, testSize, &prefs); if (LZ4F_isError(errorCode)) goto _output_error; @@ -415,7 +415,7 @@ int basicTests(U32 seed, double compressibility) DISPLAYLEVEL(3, "Compressed %i bytes into a %i bytes frame \n", (int)testSize, (int)(op-ostart)); DISPLAYLEVEL(3, "compress with wrong frameSize : \n"); - prefs.frameInfo.frameOSize = testSize+1; + prefs.frameInfo.contentSize = testSize+1; op = ostart; errorCode = LZ4F_compressBegin(cctx, compressedBuffer, testSize, &prefs); if (LZ4F_isError(errorCode)) goto _output_error; @@ -594,7 +594,7 @@ int fuzzerTests(U32 seed, unsigned nbTests, unsigned startTest, double compressi prefs.frameInfo.blockMode = (blockMode_t)BMId; prefs.frameInfo.blockSizeID = (blockSizeID_t)BSId; prefs.frameInfo.contentChecksumFlag = (contentChecksum_t)CCflag; - prefs.frameInfo.frameOSize = frameContentSize; + prefs.frameInfo.contentSize = frameContentSize; prefs.autoFlush = autoflush; prefs.compressionLevel = FUZ_rand(&randState) % 5; if ((FUZ_rand(&randState) & 0xF) == 1) prefsPtr = NULL; @@ -740,7 +740,7 @@ int main(int argc, char** argv) int proba = FUZ_COMPRESSIBILITY_DEFAULT; int result=0; - // Check command line + /* Check command line */ programName = argv[0]; for(argNb=1; argNb<argc; argNb++) { @@ -830,7 +830,7 @@ int main(int argc, char** argv) } } - // Get Seed + /* Get Seed */ printf("Starting lz4frame tester (%i-bits, %s)\n", (int)(sizeof(size_t)*8), LZ4_VERSION); if (!seedset) seed = FUZ_GetMilliStart() % 10000; diff --git a/programs/lz4io.c b/programs/lz4io.c index f5c5e98..34d24bf 100644 --- a/programs/lz4io.c +++ b/programs/lz4io.c @@ -423,7 +423,7 @@ int LZ4IO_compressFilename(const char* input_filename, const char* output_filena if (g_contentSizeFlag) { unsigned long long fileSize = LZ4IO_GetFileSize(input_filename); - prefs.frameInfo.frameOSize = fileSize; /* == 0 if input == stdin */ + prefs.frameInfo.contentSize = fileSize; /* == 0 if input == stdin */ } /* Allocate Memory */ |