[Qemu-devel] [PATCH 2/2] qcow2: Avoid shadowing variable in alloc_clusters_noref()

[Stefan Hajnoczi]

The i loop iterator is shadowed by the next free cluster index.  Both
using the variable name 'i' makes the code harder to read.

Signed-off-by: Stefan Hajnoczi <address@hidden>
---
 block/qcow2-refcount.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 47c9978..088d96d 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -554,8 +554,8 @@ static int64_t alloc_clusters_noref(BlockDriverState *bs, 
int64_t size)
     nb_clusters = size_to_clusters(s, size);
 retry:
     for(i = 0; i < nb_clusters; i++) {
-        int64_t i = s->free_cluster_index++;
-        if (get_refcount(bs, i) != 0)
+        int64_t next_cluster_index = s->free_cluster_index++;
+        if (get_refcount(bs, next_cluster_index) != 0)
             goto retry;
     }
 #ifdef DEBUG_ALLOC2
-- 
1.7.0