From: Scott Baker Date: Sat, 5 Jun 2021 05:21:00 +0000 (-0700) Subject: Use human_size() on the "multiple files compressed" output also X-Git-Tag: v1.5.1~1^2~149^2~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77001f00fb30ee63f10c96b89b4d6ccfb00078b4;p=thirdparty%2Fzstd.git Use human_size() on the "multiple files compressed" output also --- diff --git a/programs/fileio.c b/programs/fileio.c index b347da423..7432348c0 100644 --- a/programs/fileio.c +++ b/programs/fileio.c @@ -1841,6 +1841,8 @@ int FIO_compressMultipleFilenames(FIO_ctx_t* const fCtx, { int status; int error = 0; + char inputSizeStr[8] = ""; + char outputSizeStr[8] = ""; cRess_t ress = FIO_createCResources(prefs, dictFileName, FIO_getLargestFileSize(inFileNamesTable, (unsigned)fCtx->nbFilesTotal), compressionLevel, comprParams); @@ -1896,10 +1898,13 @@ int FIO_compressMultipleFilenames(FIO_ctx_t* const fCtx, } if (fCtx->nbFilesProcessed >= 1 && fCtx->nbFilesTotal > 1 && fCtx->totalBytesInput != 0) { + humanSize((unsigned long long) fCtx->totalBytesInput, inputSizeStr); + humanSize((unsigned long long) fCtx->totalBytesOutput, outputSizeStr); + DISPLAYLEVEL(2, "\r%79s\r", ""); - DISPLAYLEVEL(2, "%d files compressed : %.2f%% (%6zu => %6zu bytes)\n", fCtx->nbFilesProcessed, + DISPLAYLEVEL(2, "%3d files compressed : %.2f%% (%s => %s bytes)\n", fCtx->nbFilesProcessed, (double)fCtx->totalBytesOutput/((double)fCtx->totalBytesInput)*100, - fCtx->totalBytesInput, fCtx->totalBytesOutput); + inputSizeStr, outputSizeStr); } FIO_freeCResources(&ress);