From: Paul Cruz Date: Wed, 14 Jun 2017 20:26:19 +0000 (-0700) Subject: changing formatting again X-Git-Tag: v1.3.0~1^2~21^2~18^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc428ab3500fb4a197b006aef074270aed3b37b6;p=thirdparty%2Fzstd.git changing formatting again --- diff --git a/programs/fileio.c b/programs/fileio.c index 9d905062f..2708176c1 100644 --- a/programs/fileio.c +++ b/programs/fileio.c @@ -865,9 +865,9 @@ int FIO_compressFilename(const char* dstFileName, const char* srcFileName, typedef struct { int numActualFrames; int numSkippableFrames; - unsigned long decompressedSize; + unsigned long long decompressedSize; int canComputeDecompSize; - unsigned long compressedSize; + unsigned long long compressedSize; int usesCheck; } fileInfo_t; @@ -899,7 +899,7 @@ int getFileInfo(fileInfo_t* info, const char* inFileName){ if(srcFile==NULL){ return 1; } - info->compressedSize = UTIL_getFileSize(inFileName); + info->compressedSize = (unsigned long long)UTIL_getFileSize(inFileName); info->decompressedSize = 0; info->numActualFrames = 0; info-> numSkippableFrames = 0; @@ -1018,9 +1018,9 @@ void displayInfo(const char* inFileName, fileInfo_t* info, int displayLevel){ else{ DISPLAY("# Zstandard Frames: %d\n", info->numActualFrames); DISPLAY("# Skippable Frames: %d\n", info->numSkippableFrames); - DISPLAY("Compressed Size: %.2f MB (%lu B)\n", compressedSizeMB, info->compressedSize); + DISPLAY("Compressed Size: %.2f MB (%llu B)\n", compressedSizeMB, info->compressedSize); if(info->canComputeDecompSize){ - DISPLAY("Decompressed Size: %.2f MB (%lu B)\n", decompressedSizeMB, info->decompressedSize); + DISPLAY("Decompressed Size: %.2f MB (%llu B)\n", decompressedSizeMB, info->decompressedSize); DISPLAY("Ratio: %.4f\n", compressedSizeMB/decompressedSizeMB); } if(info->usesCheck){