examples: keep the -h option as the last one in am7xxx-play
authorAntonio Ospite <ospite@studenti.unina.it>
Wed, 28 Mar 2012 08:31:22 +0000 (10:31 +0200)
committerAntonio Ospite <ospite@studenti.unina.it>
Wed, 28 Mar 2012 08:52:20 +0000 (10:52 +0200)
This is the Unix tradition AFAICT. Also, options in the geopt() loop
usually follow the order in which they appear in the usage message.

examples/am7xxx-play.c

index 54f92e9..2fc8763 100644 (file)
@@ -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;