num2str(): Use asprintf() instead of malloc()

[fio.git] / lib / num2str.c

diff --git a/lib/num2str.c b/lib/num2str.c
index 40fb3aec923d3ce6199b64d0cf4c791c92e2151a..ce17727598d16e51ddb25576ef5718d3d223abe0 100644 (file)
--- a/lib/num2str.c
+++ b/lib/num2str.c
@@ -4,6 +4,7 @@
 #include <string.h>
 
 #include "../compiler/compiler.h"
+#include "../oslib/asprintf.h"
 #include "num2str.h"
 
 #define ARRAY_SIZE(x)    (sizeof((x)) / (sizeof((x)[0])))
@@ -30,7 +31,7 @@ char *num2str(uint64_t num, int maxlen, int base, int pow2, enum n2s_unit units)
                [N2S_BYTEPERSEC]= "B/s",
                [N2S_BITPERSEC] = "bit/s"
        };
-       const unsigned int thousand[] = { 1000, 1024 };
+       const unsigned int thousand = pow2 ? 1024 : 1000;
        unsigned int modulo;
        int post_index, carry = 0;
        char tmp[32], fmt[32];
@@ -39,17 +40,13 @@ char *num2str(uint64_t num, int maxlen, int base, int pow2, enum n2s_unit units)
        compiletime_assert(sizeof(sistr) == sizeof(iecstr), "unit prefix arrays must be identical sizes");
        assert(units < ARRAY_SIZE(unitstr));
 
-       buf = malloc(128);
-       if (!buf)
-               return NULL;
-
        if (pow2)
                unitprefix = iecstr;
        else
                unitprefix = sistr;
 
        for (post_index = 0; base > 1; post_index++)
-               base /= thousand[!!pow2];
+               base /= thousand;
 
        switch (units) {
        case N2S_NONE:
@@ -72,14 +69,14 @@ 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 < sizeof(sistr)) {
+       while (post_index < ARRAY_SIZE(sistr)) {
                sprintf(tmp, "%llu", (unsigned long long) num);
                if (strlen(tmp) <= maxlen)
                        break;
 
-               modulo = num % thousand[!!pow2];
-               num /= thousand[!!pow2];
-               carry = modulo >= thousand[!!pow2] / 2;
+               modulo = num % thousand;
+               num /= thousand;
+               carry = modulo >= thousand / 2;
                post_index++;
        }
 
@@ -91,8 +88,9 @@ done:
                if (post_index >= ARRAY_SIZE(sistr))
                        post_index = 0;
 
-               sprintf(buf, "%llu%s%s", (unsigned long long) num,
-                       unitprefix[post_index], unitstr[units]);
+               if (asprintf(&buf, "%llu%s%s", (unsigned long long) num,
+                            unitprefix[post_index], unitstr[units]) < 0)
+                       buf = NULL;
                return buf;
        }
 
@@ -110,11 +108,12 @@ done:
         * Fill in everything and return the result.
         */
        assert(maxlen - strlen(tmp) - 1 > 0);
-       assert(modulo < thousand[!!pow2]);
+       assert(modulo < thousand);
        sprintf(fmt, "%%.%df", (int)(maxlen - strlen(tmp) - 1));
-       sprintf(tmp, fmt, (double)modulo / (double)thousand[!!pow2]);
+       sprintf(tmp, fmt, (double)modulo / (double)thousand);
 
-       sprintf(buf, "%llu.%s%s%s", (unsigned long long) num, &tmp[2],
-                       unitprefix[post_index], unitstr[units]);
+       if (asprintf(&buf, "%llu.%s%s%s", (unsigned long long) num, &tmp[2],
+                    unitprefix[post_index], unitstr[units]) < 0)
+               buf = NULL;
        return buf;
 }