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

Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk

This commit is contained in:
Brian Behlendorf 2008-12-16 16:38:17 -08:00
parent 750332e323 7453ec0f2c
commit c76494c348
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/libzfs/libzfs_util.c
View File

@ -509,7 +509,7 @@ void
zfs_nicenum(uint64_t num, char *buf, size_t buflen)
{
uint64_t n = num;
int i = 0;
int i = 0, j;
char u;
while (n >= 1024) {
@ -537,10 +537,9 @@ zfs_nicenum(uint64_t num, char *buf, size_t buflen)
* develop some complex heuristics for this, but it's much
* easier just to try each combination in turn.
*/
int i;
for (i = 2; i >= 0; i--) {
if (snprintf(buf, buflen, "%.*f%c", i,
(double)num / (1ULL << 10 * i), u) <= 5)
for (j = 2; j >= 0; j--) {
if (snprintf(buf, buflen, "%.*f%c", j,
(double)num / (1ULL << 10 * j), u) <= 5)
break;
}
}