From 5a4ba89aad3517746f46481747fd76780dcc19d6 Mon Sep 17 00:00:00 2001
From: Dave Wysochanski <dwysocha@redhat.com>
Date: Thu, 31 May 2007 14:19:57 +0000
Subject: [PATCH] Small fixes to pvdisplay --maps: 1) rename struct pv_segment
 vars from 'seg' to 'pvseg', 2) Change heading

---
 WHATS_NEW             |  2 +-
 lib/display/display.c | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/WHATS_NEW b/WHATS_NEW
index dc9f7deb2..27da3e7a3 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,6 +1,6 @@
 Version 2.02.26 -
 =================================
-  Add --maps feature to pvdisplay, showing PE to LE mappings.
+  Add pvdisplay --maps implementation.
   Fix vgcfgrestore man pg to show mandatory VG name and remove LVM1 options.
   Fix vgrename man page to include UUID and be consistent with lvrename.
   Add (experimental) OpenAIS support to clvmd.
diff --git a/lib/display/display.c b/lib/display/display.c
index fb09c0471..9ff9c9b74 100644
--- a/lib/display/display.c
+++ b/lib/display/display.c
@@ -260,26 +260,26 @@ void pvdisplay_colons(struct physical_volume *pv)
 
 void pvdisplay_segments(struct physical_volume *pv)
 {
-	struct pv_segment *seg;
+	struct pv_segment *pvseg;
 
-	log_print("--- Segments ---");
+	log_print("--- Physical Segments ---");
 
-	list_iterate_items(seg, &pv->segments) {
-		if (seg->len == pv->pe_count)
+	list_iterate_items(pvseg, &pv->segments) {
+		if (pvseg->len == pv->pe_count)
 			continue;
 		log_print("Physical extent %u to %u:",
-			  seg->pe, seg->pe + seg->len - 1);
+			  pvseg->pe, pvseg->pe + pvseg->len - 1);
 
-		if (seg->lvseg) {
+		if (pvseg->lvseg) {
 			log_print("  Type\t\t%s",
-				  seg->lvseg->segtype->ops->name(seg->lvseg));
+				  pvseg->lvseg->segtype->ops->name(pvseg->lvseg));
 			log_print("  Logical volume\t%s%s/%s",
-				  seg->lvseg->lv->vg->cmd->dev_dir,
-				  seg->lvseg->lv->vg->name,
-				  seg->lvseg->lv->name);
+				  pvseg->lvseg->lv->vg->cmd->dev_dir,
+				  pvseg->lvseg->lv->vg->name,
+				  pvseg->lvseg->lv->name);
 			log_print("  Logical extents\t%d to %d",
-				  seg->lvseg->le, seg->lvseg->le +
-				  seg->lvseg->len - 1);
+				  pvseg->lvseg->le, pvseg->lvseg->le +
+				  pvseg->lvseg->len - 1);
 		} else
 			log_print("  FREE");
 	}