Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Resolve index shadowing /usr/include/string.h:304

This commit is contained in:
Brian Behlendorf 2008-12-17 11:34:19 -08:00
parent dcf0fb9ffb
commit 8af904a4b0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libzpool/util.c
View File

@ -41,24 +41,24 @@ void
nicenum(uint64_t num, char *buf) nicenum(uint64_t num, char *buf)
{ {
uint64_t n = num; uint64_t n = num;
int index = 0; int i = 0;
char u; char u;
while (n >= 1024) { while (n >= 1024) {
n = (n + (1024 / 2)) / 1024; /* Round up or down */ n = (n + (1024 / 2)) / 1024; /* Round up or down */
index++; i++;
} }
u = " KMGTPE"[index]; u = " KMGTPE"[i];
if (index == 0) { if (i == 0) {
(void) sprintf(buf, "%llu", (u_longlong_t)n); (void) sprintf(buf, "%llu", (u_longlong_t)n);
} else if (n < 10 && (num & (num - 1)) != 0) { } else if (n < 10 && (num & (num - 1)) != 0) {
(void) sprintf(buf, "%.2f%c", (void) sprintf(buf, "%.2f%c",
(double)num / (1ULL << 10 * index), u); (double)num / (1ULL << 10 * i), u);
} else if (n < 100 && (num & (num - 1)) != 0) { } else if (n < 100 && (num & (num - 1)) != 0) {
(void) sprintf(buf, "%.1f%c", (void) sprintf(buf, "%.1f%c",
(double)num / (1ULL << 10 * index), u); (double)num / (1ULL << 10 * i), u);
} else { } else {
(void) sprintf(buf, "%llu%c", (u_longlong_t)n, u); (void) sprintf(buf, "%llu%c", (u_longlong_t)n, u);
} }