diff --git a/src/common/parsing.c b/src/common/parsing.c index 8fd5da367..9df1d1046 100644 --- a/src/common/parsing.c +++ b/src/common/parsing.c @@ -77,16 +77,23 @@ static void parseSize(FFstrbuf* result, uint64_t bytes, uint32_t base, const cha ffStrbufAppendF(result, "%.*f %s", instance.config.sizeNdigits, size, prefixes[counter]); } -void ffParseSize(uint64_t bytes, FFBinaryPrefixType binaryPrefix, FFstrbuf* result) +void ffParseSize(uint64_t bytes, FFstrbuf* result) { - if(binaryPrefix == FF_BINARY_PREFIX_TYPE_IEC) - parseSize(result, bytes, 1024, (const char*[]) {"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB", NULL}); - else if(binaryPrefix == FF_BINARY_PREFIX_TYPE_SI) - parseSize(result, bytes, 1000, (const char*[]) {"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB", NULL}); - else if(binaryPrefix == FF_BINARY_PREFIX_TYPE_JEDEC) - parseSize(result, bytes, 1024, (const char*[]) {"B", "KB", "MB", "GB", "TB", NULL}); - else - parseSize(result, bytes, 1024, (const char*[]) {"B", NULL}); + switch (instance.config.binaryPrefixType) + { + case FF_BINARY_PREFIX_TYPE_IEC: + parseSize(result, bytes, 1024, (const char*[]) {"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB", NULL}); + break; + case FF_BINARY_PREFIX_TYPE_SI: + parseSize(result, bytes, 1000, (const char*[]) {"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB", NULL}); + break; + case FF_BINARY_PREFIX_TYPE_JEDEC: + parseSize(result, bytes, 1024, (const char*[]) {"B", "KB", "MB", "GB", "TB", NULL}); + break; + default: + parseSize(result, bytes, 1024, (const char*[]) {"B", NULL}); + break; + } } void ffParseGTK(FFstrbuf* buffer, const FFstrbuf* gtk2, const FFstrbuf* gtk3, const FFstrbuf* gtk4) diff --git a/src/common/parsing.h b/src/common/parsing.h index 4f8a29c04..41ac3858e 100644 --- a/src/common/parsing.h +++ b/src/common/parsing.h @@ -22,6 +22,6 @@ void ffParseGTK(FFstrbuf* buffer, const FFstrbuf* gtk2, const FFstrbuf* gtk3, co void ffVersionToPretty(const FFVersion* version, FFstrbuf* pretty); int8_t ffVersionCompare(const FFVersion* version1, const FFVersion* version2); -void ffParseSize(uint64_t bytes, FFBinaryPrefixType binaryPrefix, FFstrbuf* result); +void ffParseSize(uint64_t bytes, FFstrbuf* result); #endif diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c index de983f3ed..be61a902c 100644 --- a/src/modules/disk/disk.c +++ b/src/modules/disk/disk.c @@ -28,10 +28,10 @@ static void printDisk(FFDiskOptions* options, const FFDisk* disk) } FF_STRBUF_AUTO_DESTROY usedPretty = ffStrbufCreate(); - ffParseSize(disk->bytesUsed, instance.config.binaryPrefixType, &usedPretty); + ffParseSize(disk->bytesUsed, &usedPretty); FF_STRBUF_AUTO_DESTROY totalPretty = ffStrbufCreate(); - ffParseSize(disk->bytesTotal, instance.config.binaryPrefixType, &totalPretty); + ffParseSize(disk->bytesTotal, &totalPretty); uint8_t bytesPercentage = disk->bytesTotal > 0 ? (uint8_t) (((long double) disk->bytesUsed / (long double) disk->bytesTotal) * 100.0) : 0; diff --git a/src/modules/gpu/gpu.c b/src/modules/gpu/gpu.c index d7ec2d246..b0f03b45c 100644 --- a/src/modules/gpu/gpu.c +++ b/src/modules/gpu/gpu.c @@ -47,10 +47,10 @@ static void printGPUResult(FFGPUOptions* options, uint8_t index, const FFGPUResu if(gpu->dedicated.used != FF_GPU_VMEM_SIZE_UNSET) { - ffParseSize(gpu->dedicated.used, instance.config.binaryPrefixType, &output); + ffParseSize(gpu->dedicated.used, &output); ffStrbufAppendS(&output, " / "); } - ffParseSize(gpu->dedicated.total, instance.config.binaryPrefixType, &output); + ffParseSize(gpu->dedicated.total, &output); if(gpu->dedicated.used != FF_GPU_VMEM_SIZE_UNSET) { ffStrbufAppendS(&output, ", "); diff --git a/src/modules/memory/memory.c b/src/modules/memory/memory.c index 6663d9bc4..8bd1e7e8f 100644 --- a/src/modules/memory/memory.c +++ b/src/modules/memory/memory.c @@ -20,10 +20,10 @@ void ffPrintMemory(FFMemoryOptions* options) } FF_STRBUF_AUTO_DESTROY usedPretty = ffStrbufCreate(); - ffParseSize(storage.bytesUsed, instance.config.binaryPrefixType, &usedPretty); + ffParseSize(storage.bytesUsed, &usedPretty); FF_STRBUF_AUTO_DESTROY totalPretty = ffStrbufCreate(); - ffParseSize(storage.bytesTotal, instance.config.binaryPrefixType, &totalPretty); + ffParseSize(storage.bytesTotal, &totalPretty); uint8_t percentage = storage.bytesTotal == 0 ? 0 diff --git a/src/modules/swap/swap.c b/src/modules/swap/swap.c index 99ce0455e..5f13b286e 100644 --- a/src/modules/swap/swap.c +++ b/src/modules/swap/swap.c @@ -20,10 +20,10 @@ void ffPrintSwap(FFSwapOptions* options) } FF_STRBUF_AUTO_DESTROY usedPretty = ffStrbufCreate(); - ffParseSize(storage.bytesUsed, instance.config.binaryPrefixType, &usedPretty); + ffParseSize(storage.bytesUsed, &usedPretty); FF_STRBUF_AUTO_DESTROY totalPretty = ffStrbufCreate(); - ffParseSize(storage.bytesTotal, instance.config.binaryPrefixType, &totalPretty); + ffParseSize(storage.bytesTotal, &totalPretty); uint8_t percentage = storage.bytesTotal == 0 ? 0