sharpetronics/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-10-09 00:05:28 -04:00
Code Issues Projects Releases Wiki Activity

initialized info manually to avoid error

Browse Source
This commit is contained in:
Paul Cruz 2017-06-15 17:30:18 -07:00
parent d3b34e4a25
commit 0d7c4d766a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
programs/fileio.c
View File

@ -884,10 +884,6 @@ static int getFileInfo(fileInfo_t* info, const char* inFileName){
return 1; return 1;
} }
info->compressedSize = (unsigned long long)UTIL_getFileSize(inFileName); info->compressedSize = (unsigned long long)UTIL_getFileSize(inFileName);
info->decompressedSize = 0;
info->numActualFrames = 0;
info->numSkippableFrames = 0;
info->canComputeDecompSize = 1;
/* begin analyzing frame */ /* begin analyzing frame */
for( ; ; ){ for( ; ; ){
BYTE headerBuffer[ZSTD_FRAMEHEADERSIZE_MAX]; BYTE headerBuffer[ZSTD_FRAMEHEADERSIZE_MAX];
@ -1014,10 +1010,11 @@ static void displayInfo(const char* inFileName, fileInfo_t* info, int displayLev
const char* checkString = (info->usesCheck ? "XXH64" : "None"); const char* checkString = (info->usesCheck ? "XXH64" : "None");
if (displayLevel <= 2) { if (displayLevel <= 2) {
if (info->canComputeDecompSize) { if (info->canComputeDecompSize) {
double const ratio = (info->decompressedSize == 0) ? 0.0 : compressedSizeMB/decompressedSizeMB;
DISPLAYOUT("Skippable Non-Skippable Compressed Uncompressed Ratio Check Filename\n"); DISPLAYOUT("Skippable Non-Skippable Compressed Uncompressed Ratio Check Filename\n");
DISPLAYOUT("%9d %13d %7.2f MB %9.2f MB %5.3f %s %s\n", DISPLAYOUT("%9d %13d %7.2f MB %9.2f MB %5.3f %s %s\n",
info->numSkippableFrames, info->numActualFrames, compressedSizeMB, decompressedSizeMB, info->numSkippableFrames, info->numActualFrames, compressedSizeMB, decompressedSizeMB,
compressedSizeMB/decompressedSizeMB, checkString, inFileName); ratio, checkString, inFileName);
} }
else { else {
DISPLAYOUT("Skippable Non-Skippable Compressed Check Filename\n"); DISPLAYOUT("Skippable Non-Skippable Compressed Check Filename\n");
@ -1043,6 +1040,14 @@ static void displayInfo(const char* inFileName, fileInfo_t* info, int displayLev
int FIO_listFile(const char* inFileName, int displayLevel){ int FIO_listFile(const char* inFileName, int displayLevel){
fileInfo_t info; fileInfo_t info;
/* initialize info to avoid warnings */
info.numActualFrames = 0;
info.numSkippableFrames = 0;
info.decompressedSize = 0;
info.canComputeDecompSize = 1;
info.compressedSize = 0;
info.usesCheck = 0;
DISPLAYOUT("File: %s\n", inFileName); DISPLAYOUT("File: %s\n", inFileName);
{ {
int const error = getFileInfo(&info, inFileName); int const error = getFileInfo(&info, inFileName);