circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-04 23:56:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2017-01-16 15:36:02 +00:00
parent f20e3ee62c ef15b4195f
commit 7e110b9d99
5 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd-show-options.c
View File

@ -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) {