BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Format decimals correctly in sr_si_string_u64() 

The function previously formatted 1004 as 1.4 k and 1004000 as 1.4 M.
The function now formats 1004 as 1.004 k, 1004000 as 1.004 M and
1004000000 as 1.004 G.

Fixes #73.
This commit is contained in:
Peter Stuge 2013-06-04 02:20:57 +02:00 committed by Uwe Hermann
parent ba253f2bb9
commit 094e6b8159
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
strutil.c
View File

@ -64,32 +64,30 @@
*/ */
SR_API char *sr_si_string_u64(uint64_t x, const char *unit) SR_API char *sr_si_string_u64(uint64_t x, const char *unit)
{ {
uint8_t i;
uint64_t quot, divisor[] = {
1, SR_KHZ(1), SR_MHZ(1), SR_GHZ(1),
SR_GHZ(1000), SR_GHZ(1000*1000), SR_GHZ(1000*1000*1000)
};
const char *p, prefix[] = "\0kMGTPE";
char fmt[8], fract[20] = "", *f;
if (unit == NULL) if (unit == NULL)
unit = ""; unit = "";
if ((x >= SR_GHZ(1)) && (x % SR_GHZ(1) == 0)) { for (i = 0; (quot = x / divisor[i]) >= 1000; i++);
return g_strdup_printf("%" PRIu64 " G%s", x / SR_GHZ(1), unit);
} else if ((x >= SR_GHZ(1)) && (x % SR_GHZ(1) != 0)) { if (i) {
return g_strdup_printf("%" PRIu64 ".%" PRIu64 " G%s", sprintf(fmt, ".%%0%dlu", i * 3);
x / SR_GHZ(1), x % SR_GHZ(1), unit); f = fract + sprintf(fract, fmt, x % divisor[i]) - 1;
} else if ((x >= SR_MHZ(1)) && (x % SR_MHZ(1) == 0)) {
return g_strdup_printf("%" PRIu64 " M%s", while (f >= fract && strchr("0.", *f))
x / SR_MHZ(1), unit); *f-- = 0;
} else if ((x >= SR_MHZ(1)) && (x % SR_MHZ(1) != 0)) {
return g_strdup_printf("%" PRIu64 ".%" PRIu64 " M%s",
x / SR_MHZ(1), x % SR_MHZ(1), unit);
} else if ((x >= SR_KHZ(1)) && (x % SR_KHZ(1) == 0)) {
return g_strdup_printf("%" PRIu64 " k%s",
x / SR_KHZ(1), unit);
} else if ((x >= SR_KHZ(1)) && (x % SR_KHZ(1) != 0)) {
return g_strdup_printf("%" PRIu64 ".%" PRIu64 " k%s",
x / SR_KHZ(1), x % SR_KHZ(1), unit);
} else {
return g_strdup_printf("%" PRIu64 " %s", x, unit);
} }
sr_err("%s: Error creating SI units string.", __func__); p = prefix + i;
return NULL;
return g_strdup_printf("%" PRIu64 "%s %.1s%s", quot, fract, p, unit);
} }
/** /**