X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=lib%2Fnum2str.c;h=0ed05f33ea8039b52f5c18a7574ef78adb4caac6;hb=129fb2d422557e493020a8eac00867749af284b4;hp=896186888716424f13ecf0dc174a416cffeb7bd6;hpb=b7e147d1552c022838f4b9d8f02c477b6f906084;p=fio.git diff --git a/lib/num2str.c b/lib/num2str.c index 89618688..0ed05f33 100644 --- a/lib/num2str.c +++ b/lib/num2str.c @@ -9,7 +9,7 @@ /* * Cheesy number->string conversion, complete with carry rounding error. */ -char *num2str(unsigned long num, int maxlen, int base, int pow2, int unit_base) +char *num2str(uint64_t num, int maxlen, int base, int pow2, int unit_base) { const char *postfix[] = { "", "K", "M", "G", "P", "E" }; const char *byte_postfix[] = { "", "B", "bit" }; @@ -36,7 +36,7 @@ char *num2str(unsigned long num, int maxlen, int base, int pow2, int unit_base) modulo = -1U; while (post_index < sizeof(postfix)) { - sprintf(tmp, "%lu", num); + sprintf(tmp, "%llu", (unsigned long long) num); if (strlen(tmp) <= maxlen) break; @@ -51,12 +51,12 @@ done: if (post_index >= ARRAY_LENGTH(postfix)) post_index = 0; - sprintf(buf, "%lu%s%s", num, postfix[post_index], - byte_postfix[byte_post_index]); + sprintf(buf, "%llu%s%s", (unsigned long long) num, + postfix[post_index], byte_postfix[byte_post_index]); return buf; } - sprintf(tmp, "%lu", num); + sprintf(tmp, "%llu", (unsigned long long) num); decimals = maxlen - strlen(tmp); if (decimals <= 1) { if (carry) @@ -72,7 +72,7 @@ done: modulo = (modulo + 9) / 10; } while (1); - sprintf(buf, "%lu.%u%s%s", num, modulo, postfix[post_index], - byte_postfix[byte_post_index]); + sprintf(buf, "%llu.%u%s%s", (unsigned long long) num, modulo, + postfix[post_index], byte_postfix[byte_post_index]); return buf; }