commit b8804bb97cbadb6c77987058c0e77d30bc72a3c2
author Wan-Teh Chang <wtc@google.com> Thu Sep 17 12:32:40 2020 -0700
committer Wan-Teh Chang <wtc@google.com> Fri Sep 18 18:15:22 2020 +0000
tree af5f3007ccb28df2589974fab76001ea507a2cd3
parent e6d686dc6afac3d889e738b4c4c2d1b9fd0de1d1

Clean up some calls to arg_match()

In parse_global_config(), merge the very first arg_match() call into the
if-else-if control structure that contains all the other arg_match()
calls.

In parse_stream_params(), we can break out of the for loop that
traverses the ctrl_args array as soon as arg_match() returns 1.

Change-Id: I3fc32a43e9d4bb43f2dc2205895196e996c2e38b

apps/aomenc.c

diff --git a/apps/aomenc.c b/apps/aomenc.c
index 425f043..8d9c76c 100644
--- a/apps/aomenc.c
+++ b/apps/aomenc.c
@@ -1186,12 +1186,11 @@
     arg.argv_step = 1;
 
     if (arg_match(&arg, &use_cfg, argi)) {
-      if (cfg_included) continue;
-      parse_cfg(arg.val, &global->encoder_config);
-      cfg_included = 1;
-      continue;
-    }
-    if (arg_match(&arg, &help, argi)) {
+      if (!cfg_included) {
+        parse_cfg(arg.val, &global->encoder_config);
+        cfg_included = 1;
+      }
+    } else if (arg_match(&arg, &help, argi)) {
       show_help(stdout, 0);
       exit(EXIT_SUCCESS);
     } else if (arg_match(&arg, &codecarg, argi)) {
@@ -1641,6 +1640,7 @@
           if (ctrl_args_map) {
             set_config_arg_ctrls(config, ctrl_args_map[i], &arg);
           }
+          break;
         }
       }
       if (!match) argj++;