From 8387b473524f86c718bff79212a37222fee6e15d Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Mon, 15 Sep 2003 15:01:00 +0000
Subject: [PATCH] Generalise 'invalid chars' error mesg to just say 'invalid'

---
 tools/lvcreate.c     | 4 ++--
 tools/lvrename.c     | 3 +--
 tools/vgcfgrestore.c | 3 +--
 tools/vgcreate.c     | 3 +--
 tools/vgrename.c     | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/tools/lvcreate.c b/tools/lvcreate.c
index 4d11716f4..f5259a807 100644
--- a/tools/lvcreate.c
+++ b/tools/lvcreate.c
@@ -119,8 +119,8 @@ static int _read_name_params(struct lvcreate_params *lp,
 		}
 
 		if (!validate_name(lp->lv_name)) {
-			log_error("Logical volume name \"%s\" has invalid "
-				  "characters", lp->lv_name);
+			log_error("Logical volume name \"%s\" is invalid",
+				  lp->lv_name);
 			return 0;
 		}
 	}
diff --git a/tools/lvrename.c b/tools/lvrename.c
index 35e1b230c..be6adfd72 100644
--- a/tools/lvrename.c
+++ b/tools/lvrename.c
@@ -96,8 +96,7 @@ int lvrename(struct cmd_context *cmd, int argc, char **argv)
 	}
 
 	if (!validate_name(lv_name_new)) {
-		log_error
-		    ("New logical volume name \"%s\" has invalid characters",
+		log_error("New logical volume name \"%s\" is invalid",
 		     lv_name_new);
 		return EINVALID_CMD_LINE;
 	}
diff --git a/tools/vgcfgrestore.c b/tools/vgcfgrestore.c
index f48dc1225..5395a00e2 100644
--- a/tools/vgcfgrestore.c
+++ b/tools/vgcfgrestore.c
@@ -21,8 +21,7 @@ int vgcfgrestore(struct cmd_context *cmd, int argc, char **argv)
 		vg_name += strlen(cmd->dev_dir);
 
 	if (!validate_name(vg_name)) {
-		log_error("Volume group name \"%s\" has invalid characters",
-			  vg_name);
+		log_error("Volume group name \"%s\" is invalid", vg_name);
 		return ECMD_FAILED;
 	}
 
diff --git a/tools/vgcreate.c b/tools/vgcreate.c
index 707dc01cd..d5d8994bf 100644
--- a/tools/vgcreate.c
+++ b/tools/vgcreate.c
@@ -74,8 +74,7 @@ int vgcreate(struct cmd_context *cmd, int argc, char **argv)
 	}
 
 	if (!validate_name(vg_name)) {
-		log_error("New volume group name \"%s\" has invalid characters",
-			  vg_name);
+		log_error("New volume group name \"%s\" is invalid", vg_name);
 		return ECMD_FAILED;
 	}
 
diff --git a/tools/vgrename.c b/tools/vgrename.c
index 9b485cdfd..cca5347bd 100644
--- a/tools/vgrename.c
+++ b/tools/vgrename.c
@@ -57,7 +57,7 @@ int vgrename(struct cmd_context *cmd, int argc, char **argv)
 	}
 
 	if (!validate_name(vg_name_new)) {
-		log_error("New volume group name \"%s\" has invalid characters",
+		log_error("New volume group name \"%s\" is invalid",
 			  vg_name_new);
 		return ECMD_FAILED;
 	}
-- 
2.43.5