From 78c14fab5f339e0165ab32d3c50efbed16950489 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 2 Jul 2020 16:31:35 -0700 Subject: [PATCH] num2str(): Add the E (exa) prefix This change guarantees that all 64-bit integers that should be assigned a multiplier are assigned a multiplier. Signed-off-by: Bart Van Assche --- lib/num2str.c | 4 ++-- unittests/lib/num2str.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/num2str.c b/lib/num2str.c index 7f628d29..726f1c44 100644 --- a/lib/num2str.c +++ b/lib/num2str.c @@ -20,8 +20,8 @@ */ char *num2str(uint64_t num, int maxlen, int base, int pow2, enum n2s_unit units) { - const char *sistr[] = { "", "k", "M", "G", "T", "P" }; - const char *iecstr[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi" }; + const char *sistr[] = { "", "k", "M", "G", "T", "P", "E" }; + const char *iecstr[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei" }; const char **unitprefix; static const char *const unitstr[] = { [N2S_NONE] = "", diff --git a/unittests/lib/num2str.c b/unittests/lib/num2str.c index 931e28a4..a3492a8d 100644 --- a/unittests/lib/num2str.c +++ b/unittests/lib/num2str.c @@ -19,8 +19,8 @@ static const struct testcase testcases[] = { { UINT64_MAX, 99, 1, 0, N2S_NONE, "18446744073709551615" }, { 18446744073709551, 2, 1, 0, N2S_NONE, "18P" }, { 18446744073709551, 4, 1, 0, N2S_NONE, "18.4P" }, - { UINT64_MAX, 2, 1, 0, N2S_NONE, "18" }, - { UINT64_MAX, 4, 1, 0, N2S_NONE, "18.4" }, + { UINT64_MAX, 2, 1, 0, N2S_NONE, "18E" }, + { UINT64_MAX, 4, 1, 0, N2S_NONE, "18.4E" }, }; static void test_num2str(void) -- 2.25.1