diff options
| author | Thomas Adam <thomas@xteddy.org> | 2022-02-14 10:01:11 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2022-02-14 10:01:11 +0000 |
| commit | df681390a6861b6a77d4623baf46d0a435729003 (patch) | |
| tree | fa2df3c9bb1ae959d708b83f1d1c680ad837cd38 | |
| parent | c67abcf8182b3a4e4c1e71b370c814a65c12a46c (diff) | |
| parent | 040164555a0e41d23082b74a2a22ff370e8193c2 (diff) | |
| download | rtmux-df681390a6861b6a77d4623baf46d0a435729003.tar.gz rtmux-df681390a6861b6a77d4623baf46d0a435729003.tar.bz2 rtmux-df681390a6861b6a77d4623baf46d0a435729003.zip | |
Merge branch 'obsd-master' into master
| -rw-r--r-- | cmd-show-options.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmd-show-options.c b/cmd-show-options.c index 90226ad3..252a33c6 100644 --- a/cmd-show-options.c +++ b/cmd-show-options.c @@ -102,7 +102,7 @@ cmd_show_options_exec(struct cmd *self, struct cmdq_item *item) name = options_match(argument, &idx, &ambiguous); if (name == NULL) { if (args_has(args, 'q')) - goto fail; + goto out; if (ambiguous) cmdq_error(item, "ambiguous option: %s", argument); else @@ -113,7 +113,7 @@ cmd_show_options_exec(struct cmd *self, struct cmdq_item *item) &cause); if (scope == OPTIONS_TABLE_NONE) { if (args_has(args, 'q')) - goto fail; + goto out; cmdq_error(item, "%s", cause); free(cause); goto fail; @@ -128,11 +128,12 @@ cmd_show_options_exec(struct cmd *self, struct cmdq_item *item) cmd_show_options_print(self, item, o, idx, parent); else if (*name == '@') { if (args_has(args, 'q')) - goto fail; + goto out; cmdq_error(item, "invalid option: %s", argument); goto fail; } +out: free(name); free(argument); return (CMD_RETURN_NORMAL); |