Patchwork [10/18] qcow2: Avoid shadowing variable in alloc_clusters_noref()

login
register
mail settings
Submitter Kevin Wolf
Date April 30, 2010, 2 p.m.
Message ID <1272636040-17374-11-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/51340/
State New
Headers show

Comments

Kevin Wolf - April 30, 2010, 2 p.m.
From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

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 <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2-refcount.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 2661493..95491d3 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -556,8 +556,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