From: Antonio Ospite <ospite@studenti.unina.it>
Date: Wed, 28 Mar 2012 08:31:22 +0000 (+0200)
Subject: examples: keep the -h option as the last one in am7xxx-play
X-Git-Tag: v0.1.1~2
X-Git-Url: https://git.ao2.it/libam7xxx.git/commitdiff_plain/60587dbefe9fb0cb479133b0a1b1a5cbdfa7fee9?ds=sidebyside;hp=--cc

examples: keep the -h option as the last one in am7xxx-play

This is the Unix tradition AFAICT. Also, options in the geopt() loop
usually follow the order in which they appear in the usage message.
---

60587dbefe9fb0cb479133b0a1b1a5cbdfa7fee9
diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c
index 54f92e9..2fc8763 100644
--- a/examples/am7xxx-play.c
+++ b/examples/am7xxx-play.c
@@ -604,7 +604,7 @@ int main(int argc, char *argv[])
 	am7xxx_context *ctx;
 	am7xxx_device *dev;
 
-	while ((opt = getopt(argc, argv, "f:i:o:s:uF:q:l:hp:")) != -1) {
+	while ((opt = getopt(argc, argv, "f:i:o:s:uF:q:l:p:h")) != -1) {
 		switch (opt) {
 		case 'f':
 			input_format_string = strdup(optarg);
@@ -684,11 +684,6 @@ int main(int argc, char *argv[])
 				log_level = AM7XXX_LOG_ERROR;
 			}
 			break;
-		case 'h':
-			usage(argv[0]);
-			ret = 0;
-			goto out;
-			break;
 		case 'p':
 			power_mode = atoi(optarg);
 			switch(power_mode) {
@@ -705,6 +700,11 @@ int main(int argc, char *argv[])
 				goto out;
 			}
 			break;
+		case 'h':
+			usage(argv[0]);
+			ret = 0;
+			goto out;
+			break;
 		default: /* '?' */
 			usage(argv[0]);
 			ret = -EINVAL;