Resolve shadow conflict

diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c
index ff90cacbd0e18b7c4afcd77ffb7689f9031f7b34..045fc657e94da33a977228f743a0cf54d143e6bc 100644 (file)
--- a/lib/libzfs/libzfs_util.c
+++ b/lib/libzfs/libzfs_util.c
@@ -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;
                }
        }