From b3fed93a7434ba6fcd864bd8e8b4b780de7e1f1e Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Mon, 3 Nov 2008 16:26:27 +0000 Subject: [PATCH] Rename a couple of variables that matched function names. --- WHATS_NEW | 1 + lib/format1/disk-rep.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 530fb2f4b..260fd3ca8 100644 --- 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 2379cf2d9..67b22461b 100644 --- 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); } -- 2.43.5