aboutsummaryrefslogtreecommitdiff
path: root/cmd-show-options.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-01-16 15:36:02 +0000
committerThomas Adam <thomas@xteddy.org>2017-01-16 15:36:02 +0000
commit7e110b9d99cf4ffa05e316c954d5f2f315e3f7cc (patch)
tree556e0e939b96290f5e2e233044d03c28366c25ae /cmd-show-options.c
parentf20e3ee62c310da3eb091a2773e21442412db4ed (diff)
parentef15b4195f1453bf6f81cfd1e456c049922aa574 (diff)
downloadrtmux-7e110b9d99cf4ffa05e316c954d5f2f315e3f7cc.tar.gz
rtmux-7e110b9d99cf4ffa05e316c954d5f2f315e3f7cc.tar.bz2
rtmux-7e110b9d99cf4ffa05e316c954d5f2f315e3f7cc.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-show-options.c')
-rw-r--r--cmd-show-options.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/cmd-show-options.c b/cmd-show-options.c
index 5afffac1..ac5823b6 100644
--- a/cmd-show-options.c
+++ b/cmd-show-options.c
@@ -86,7 +86,7 @@ cmd_show_options_exec(struct cmd *self, struct cmdq_item *item)
static void
cmd_show_options_print(struct cmd *self, struct cmdq_item *item,
- struct option *o, int idx)
+ struct options_entry *o, int idx)
{
const char *name;
const char *value;
@@ -117,10 +117,10 @@ static enum cmd_retval
cmd_show_options_one(struct cmd *self, struct cmdq_item *item,
struct options *oo)
{
- struct args *args = self->args;
- struct option *o;
- int idx, ambiguous;
- const char *name = args->argv[0];
+ struct args *args = self->args;
+ struct options_entry *o;
+ int idx, ambiguous;
+ const char *name = args->argv[0];
o = options_match_get(oo, name, &idx, 1, &ambiguous);
if (o == NULL) {
@@ -143,9 +143,9 @@ static enum cmd_retval
cmd_show_options_all(struct cmd *self, struct cmdq_item *item,
struct options *oo)
{
- struct option *o;
- const struct options_table_entry *oe;
- u_int size, idx;
+ struct options_entry *o;
+ const struct options_table_entry *oe;
+ u_int size, idx;
o = options_first(oo);
while (o != NULL) {