Merge branch 'num2str-patch' of https://github.com/gloit042/fio

[fio.git] / lib / num2str.c

diff --git a/lib/num2str.c b/lib/num2str.c
index 423d97b2573986ac75fbf577358830b523fa2a83..cd89a0e59171291017ece4429bc70b4e43eb95ca 100644 (file)
--- a/lib/num2str.c
+++ b/lib/num2str.c
@@ -7,8 +7,6 @@
 #include "../oslib/asprintf.h"
 #include "num2str.h"
 
-#define ARRAY_SIZE(x)    (sizeof((x)) / (sizeof((x)[0])))
-
 /**
  * num2str() - Cheesy number->string conversion, complete with carry rounding error.
  * @num: quantity (e.g., number of blocks, bytes or bits)
@@ -38,7 +36,7 @@ char *num2str(uint64_t num, int maxlen, int base, int pow2, enum n2s_unit units)
        char *buf;
 
        compiletime_assert(sizeof(sistr) == sizeof(iecstr), "unit prefix arrays must be identical sizes");
-       assert(units < ARRAY_SIZE(unitstr));
+       assert(units < FIO_ARRAY_SIZE(unitstr));
 
        if (pow2)
                unitprefix = iecstr;
@@ -69,7 +67,7 @@ char *num2str(uint64_t num, int maxlen, int base, int pow2, enum n2s_unit units)
         * Divide by K/Ki until string length of num <= maxlen.
         */
        modulo = -1U;
-       while (post_index < ARRAY_SIZE(sistr)) {
+       while (post_index < FIO_ARRAY_SIZE(sistr)) {
                sprintf(tmp, "%llu", (unsigned long long) num);
                if (strlen(tmp) <= maxlen)
                        break;
@@ -80,7 +78,7 @@ char *num2str(uint64_t num, int maxlen, int base, int pow2, enum n2s_unit units)
                post_index++;
        }
 
-       if (post_index >= ARRAY_SIZE(sistr))
+       if (post_index >= FIO_ARRAY_SIZE(sistr))
                post_index = 0;
 
        /*