matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ip-link: in human readable output use dynamic precision length

This commit is contained in:
Christian Hesse 2014-11-04 22:17:15 +01:00 committed by Stephen Hemminger
parent 5cb6aa0348
commit 50ec66507b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ip/ipaddress.c
View File

@ -324,6 +324,8 @@ static void print_num(FILE *fp, unsigned width, uint64_t count)
const char *prefix = "kMGTPE"; const char *prefix = "kMGTPE";
const unsigned int base = use_iec ? 1024 : 1000; const unsigned int base = use_iec ? 1024 : 1000;
uint64_t powi = 1; uint64_t powi = 1;
uint16_t powj = 1;
uint8_t precision = 2;
char buf[64]; char buf[64];
if (!human_readable || count < base) { if (!human_readable || count < base) {
@ -343,8 +345,15 @@ static void print_num(FILE *fp, unsigned width, uint64_t count)
++prefix; ++prefix;
} }
snprintf(buf, sizeof(buf), "%.1f%c%s", (double) count / powi, /* try to guess a good number of digits for precision */
*prefix, use_iec ? "i" : ""); for (; precision > 0; precision--) {
powj *= 10;
if (count / powi < powj)
break;
}
snprintf(buf, sizeof(buf), "%.*f%c%s", precision,
(double) count / powi, *prefix, use_iec ? "i" : "");
fprintf(fp, "%-*s ", width, buf); fprintf(fp, "%-*s ", width, buf);
} }