X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=main.cpp;h=285c1535f3c20898307923de6c49ad08bcbfc899;hb=2a53532cca7d8ac0b6e61413a9f69580f9f8c941;hp=cfaba777d2f26add33a344da7aacf17facc8931d;hpb=fe3a1c218407f6b8a0d7ac7c454593809212ea9e;p=pulseview.git

diff --git a/main.cpp b/main.cpp
index cfaba77..285c153 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,18 +80,28 @@ 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}
 		};
 
 		const int c = getopt_long(argc, argv,
-			"l:Vh?", long_options, NULL);
+			"l:Vh?", long_options, nullptr);
 		if (c == -1)
 			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;
 		}
 	}
 
@@ -127,7 +129,7 @@ int main(int argc, char *argv[])
 
 #ifdef ENABLE_DECODE
 		// Initialise libsigrokdecode
-		if (srd_init(NULL) != SRD_OK) {
+		if (srd_init(nullptr) != SRD_OK) {
 			qDebug() << "ERROR: libsigrokdecode init failed.";
 			break;
 		}