From e1c629bb3e01e3df24c189c0ecabde37788139a2 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 28 Apr 2022 15:10:11 -0700 Subject: [PATCH 156/217] util: Use SZ_ size macros in display size In preparation for adding "Terabyte" support, cleanup the "1024" multiplication with the SZ_* macros. Link: https://lore.kernel.org/r/165118381109.1676208.8857362319985041575.stgit@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Dan Williams Signed-off-by: Vishal Verma --- util/json.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/util/json.c b/util/json.c index f8cc81f..ebdf8d9 100644 --- a/util/json.c +++ b/util/json.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -27,24 +28,24 @@ static int display_size(struct json_object *jobj, struct printbuf *pbuf, * If prefix == JEDEC, we mean prefixes like kilo,mega,giga etc. */ - if (bytes < 5000*1024) + if (bytes < 5000*SZ_1K) snprintf(buf, sizeof(buf), "%lld", bytes); else { /* IEC */ - if (bytes < 2*1024LL*1024LL*1024LL) { - long cMiB = (bytes * 200LL / (1LL<<20) +1) /2; + if (bytes < 2L*SZ_1G) { + long cMiB = (bytes * 200LL / SZ_1M+1) /2; c = snprintf(buf, sizeof(buf), "\"%ld.%02ld MiB", cMiB/100 , cMiB % 100); } else { - long cGiB = (bytes * 200LL / (1LL<<30) +1) /2; + long cGiB = (bytes * 200LL / SZ_1G+1) /2; c = snprintf(buf, sizeof(buf), "\"%ld.%02ld GiB", cGiB/100 , cGiB % 100); } /* JEDEC */ - if (bytes < 2*1024LL*1024LL*1024LL) { + if (bytes < 2L*SZ_1G) { long cMB = (bytes / (1000000LL / 200LL) + 1) / 2; snprintf(buf + c, sizeof(buf) - c, " (%ld.%02ld MB)\"", -- 2.27.0