From 52f3709f67fdef994a6c6403f2c61a5658af62f0 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Mon, 7 Jan 2002 22:49:04 +0000
Subject: [PATCH] Sync tidy.

---
 tools/errors.h  | 6 +++---
 tools/lvm.c     | 3 ++-
 tools/vgmerge.c | 2 --
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/tools/errors.h b/tools/errors.h
index ea58b0800..ad738fe59 100644
--- a/tools/errors.h
+++ b/tools/errors.h
@@ -22,9 +22,9 @@
 #define _LVM_ERRORS_H
 
 #define EINVALID_CMD_LINE	1
-#define ENO_SUCH_CMD	3
-#define ECMD_PROCESSED	4
+#define ENO_SUCH_CMD		3
+#define ECMD_PROCESSED		4
 #define ECMD_FAILED		5
 
-#endif /* #ifndef _LVM_ERROR_H_INCLUDE */
+#endif
 
diff --git a/tools/lvm.c b/tools/lvm.c
index 7dee34299..42e5cb8a9 100644
--- a/tools/lvm.c
+++ b/tools/lvm.c
@@ -510,7 +510,8 @@ static int process_common_commands(struct command *com)
 		kill(getpid(), SIGSTOP);
 
 	if (arg_count(debug_ARG))
-		_current_settings.debug = arg_count(debug_ARG);
+		_current_settings.debug = LOG_FATAL + 
+					  (arg_count(debug_ARG) - 1);
 
 	if (arg_count(verbose_ARG))
 		_current_settings.verbose = arg_count(verbose_ARG);
diff --git a/tools/vgmerge.c b/tools/vgmerge.c
index 143f801b5..fbba71328 100644
--- a/tools/vgmerge.c
+++ b/tools/vgmerge.c
@@ -112,8 +112,6 @@ int vgmerge_single(const char *vg_name_to, const char *vg_name_from)
 
 	/* FIXME List arg: vg_show_with_pv_and_lv(vg_to); */
 
-	/* FIXME Test arg (into all tools) */
-
 	/* Merge volume groups */
 	while (!list_empty(&vg_from->pvs)) {
 		struct list *pvh = vg_from->pvs.n;