From aa90e86b1c25f67ea64d7bec0560f531c67bc853 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Sun, 12 Apr 2015 14:24:58 +0100
Subject: [PATCH] Reordered argument handling

---
 main.cpp | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/main.cpp b/main.cpp
index cfaba777..089deee7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -56,9 +56,11 @@ void usage()
 		"  %s [OPTION…] [FILE] — %s\n"
 		"\n"
 		"Help Options:\n"
-		"  -l, --loglevel                  Set libsigrok/libsigrokdecode loglevel\n"
-		"  -V, --version                   Show release version\n"
 		"  -h, -?, --help                  Show help option\n"
+		"\n"
+		"Application Options:\n"
+		"  -V, --version                   Show release version\n"
+		"  -l, --loglevel                  Set libsigrok/libsigrokdecode loglevel\n"
 		"\n", PV_BIN_NAME, PV_DESCRIPTION);
 }
 
@@ -78,9 +80,9 @@ int main(int argc, char *argv[])
 	// Parse arguments
 	while (1) {
 		static const struct option long_options[] = {
-			{"loglevel", required_argument, 0, 'l'},
-			{"version", no_argument, 0, 'V'},
 			{"help", no_argument, 0, 'h'},
+			{"version", no_argument, 0, 'V'},
+			{"loglevel", required_argument, 0, 'l'},
 			{0, 0, 0, 0}
 		};
 
@@ -90,6 +92,16 @@ int main(int argc, char *argv[])
 			break;
 
 		switch (c) {
+		case 'h':
+		case '?':
+			usage();
+			return 0;
+
+		case 'V':
+			// Print version info
+			fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
+			return 0;
+
 		case 'l':
 		{
 			const int loglevel = atoi(optarg);
@@ -101,16 +113,6 @@ int main(int argc, char *argv[])
 
 			break;
 		}
-
-		case 'V':
-			// Print version info
-			fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
-			return 0;
-
-		case 'h':
-		case '?':
-			usage();
-			return 0;
 		}
 	}
 
-- 
2.30.2