cluster: RHEL56 - Revert "qdisk: mkqdisk argument positioning"

Lon Hohberger lon at fedoraproject.org
Fri Nov 5 15:02:31 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ea929dd303acb1c99112efda799433a4d60aec36
Commit:        ea929dd303acb1c99112efda799433a4d60aec36
Parent:        af5036d74431ea4446ed7941a58ffafd09dc1050
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Fri Nov 5 10:51:59 2010 -0400
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Fri Nov 5 10:51:59 2010 -0400

Revert "qdisk: mkqdisk argument positioning"

This reverts commit c6873545f430825a0f211dd595a2248f24ab88c1.
---
 cman/qdisk/mkqdisk.c |   21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/cman/qdisk/mkqdisk.c b/cman/qdisk/mkqdisk.c
index edccf1c..46d6b63 100644
--- a/cman/qdisk/mkqdisk.c
+++ b/cman/qdisk/mkqdisk.c
@@ -37,7 +37,7 @@ main(int argc, char **argv)
 {
 	char device[128];
 	char *newdev = NULL, *newlabel = NULL;
-	int rv, flg = 0, verbose_level = 1;
+	int rv, verbose_level = 1;
 
 	printf("mkqdisk v0.6.0\n");
 
@@ -48,12 +48,13 @@ main(int argc, char **argv)
 			break;
 		case 'L':
 			/* List */
-			flg = rv;
- 			break;
-		case 'f':
-			flg = rv;
-			newlabel = optarg;
+			close(2);
+			return find_partitions(NULL, NULL, 0, verbose_level);
 			break;
+		case 'f':
+			close(2);
+			return find_partitions( optarg, device,
+					       sizeof(device), verbose_level);
 		case 'c':
 			newdev = optarg;
 			break;
@@ -69,14 +70,6 @@ main(int argc, char **argv)
 		}
 	}
 
-	/* list */
-	if (flg == 'L') {
-		return find_partitions(NULL, NULL, 0, verbose_level);
-	} else if (flg == 'f') {
-		return find_partitions( newlabel, device,
-				       sizeof(device), verbose_level);
-	}
-
 	if (!newdev && !newlabel) {
 		printf("usage: mkqdisk -L | -f <label> | -c "
 		       "<device> -l <label>\n");


More information about the cluster-commits mailing list