Rename a couple of variables that matched function names.

diff --git a/WHATS_NEW b/WHATS_NEW
index 530fb2f4bbc02700b067a513ee6feb8f86971492..260fd3ca83d7021b82962724792a0608fcc094a8 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.43 -
 ===================================
+  Rename a couple of variables that matched function names.
   Use simplified x.y.z version number in libdevmapper.pc.
   Merge device-mapper into the lvm2 tree.
   Remove ancient debian directory.

diff --git a/lib/format1/disk-rep.c b/lib/format1/disk-rep.c
index 2379cf2d92e94348cf9088604705521c03cc22ed..67b22461b4bfd40956974ae11539e4ea430546a6 100644 (file)
--- a/lib/format1/disk-rep.c
+++ b/lib/format1/disk-rep.c
@@ -277,12 +277,12 @@ static int _check_lvd(struct lv_disk *lvd)
 
 static int _read_lvs(struct disk_list *data)
 {
-       unsigned int i, read = 0;
+       unsigned int i, lvs_read = 0;
        uint64_t pos;
        struct lvd_list *ll;
        struct vg_disk *vgd = &data->vgd;
 
-       for (i = 0; (i < vgd->lv_max) && (read < vgd->lv_cur); i++) {
+       for (i = 0; (i < vgd->lv_max) && (lvs_read < vgd->lv_cur); i++) {
                pos = data->pvd.lv_on_disk.base + (i * sizeof(struct lv_disk));
                ll = dm_pool_alloc(data->mem, sizeof(*ll));
 
@@ -295,7 +295,7 @@ static int _read_lvs(struct disk_list *data)
                if (!_check_lvd(&ll->lvd))
                        continue;
 
-               read++;
+               lvs_read++;
                list_add(&data->lvds, &ll->list);
        }