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

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-16 16:22:45 -08:00
parent 64afd6d742 95421f5f0f
commit b09c579aa6
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/libzfs/libzfs_util.c
View File

@ -509,19 +509,19 @@ void
zfs_nicenum(uint64_t num, char *buf, size_t buflen) zfs_nicenum(uint64_t num, char *buf, size_t buflen)
{ {
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 /= 1024; n /= 1024;
index++; i++;
} }
u = " KMGTPE"[index]; u = " KMGTPE"[i];
if (index == 0) { if (i == 0) {
(void) snprintf(buf, buflen, "%llu", (u_longlong_t) n); (void) snprintf(buf, buflen, "%llu", (u_longlong_t) n);
} else if ((num & ((1ULL << 10 * index) - 1)) == 0) { } else if ((num & ((1ULL << 10 * i) - 1)) == 0) {
/* /*
* If this is an even multiple of the base, always display * If this is an even multiple of the base, always display
* without any decimal precision. * without any decimal precision.
@ -540,7 +540,7 @@ zfs_nicenum(uint64_t num, char *buf, size_t buflen)
int i; int i;
for (i = 2; i >= 0; i--) { for (i = 2; i >= 0; i--) {
if (snprintf(buf, buflen, "%.*f%c", i, if (snprintf(buf, buflen, "%.*f%c", i,
(double)num / (1ULL << 10 * index), u) <= 5) (double)num / (1ULL << 10 * i), u) <= 5)
break; break;
} }
} }
@ -1371,7 +1371,7 @@ zprop_expand_list(libzfs_handle_t *hdl, zprop_list_t **plp, zfs_type_t type)
{ {
zprop_list_t *entry; zprop_list_t *entry;
zprop_list_t **last; zprop_list_t **last;
expand_data_t exp; expand_data_t ed;
if (*plp == NULL) { if (*plp == NULL) {
/* /*
@ -1381,11 +1381,11 @@ zprop_expand_list(libzfs_handle_t *hdl, zprop_list_t **plp, zfs_type_t type)
*/ */
last = plp; last = plp;
exp.last = last; ed.last = last;
exp.hdl = hdl; ed.hdl = hdl;
exp.type = type; ed.type = type;
if (zprop_iter_common(zprop_expand_list_cb, &exp, B_FALSE, if (zprop_iter_common(zprop_expand_list_cb, &ed, B_FALSE,
B_FALSE, type) == ZPROP_INVAL) B_FALSE, type) == ZPROP_INVAL)
return (-1); return (-1);