diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2020-05-09 14:33:25 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2020-05-09 14:33:25 +0100 |
| commit | ca18990826f29ced336a8164d923b5f08d6f3de8 (patch) | |
| tree | 3b11ffc40d6403044f5e698aaa38d240b85251d1 | |
| parent | 5e97d79eb1337db2dd5969fb2c339d14427f545b (diff) | |
| download | rtmux-ca18990826f29ced336a8164d923b5f08d6f3de8.tar.gz rtmux-ca18990826f29ced336a8164d923b5f08d6f3de8.tar.bz2 rtmux-ca18990826f29ced336a8164d923b5f08d6f3de8.zip | |
Fix some warnings, from Jan Polensky.
| -rw-r--r-- | window-customize.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/window-customize.c b/window-customize.c index e07bc243..1030201d 100644 --- a/window-customize.c +++ b/window-customize.c @@ -268,7 +268,7 @@ window_customize_build_option(struct window_customize_modedata *data, if (oe != NULL && oe->unit != NULL) format_add(ft, "option_unit", "%s", oe->unit); else - format_add(ft, "option_unit", ""); + format_add(ft, "option_unit", "%s", ""); if (!array) { value = options_to_string(o, -1, 0); @@ -367,12 +367,12 @@ window_customize_build_options(struct window_customize_modedata *data, o = options_get(oo1, list[i]); else o = options_get(oo2, list[i]); - if (options_owner(o) == oo0) - scope = scope0; + if (options_owner(o) == oo2) + scope = scope2; else if (options_owner(o) == oo1) scope = scope1; - else if (options_owner(o) == oo2) - scope = scope2; + else + scope = scope0; window_customize_build_option(data, top, scope, o, ft, filter, fs); } @@ -391,12 +391,12 @@ window_customize_build_options(struct window_customize_modedata *data, o = options_get(oo1, name); else o = loop; - if (options_owner(o) == oo0) - scope = scope0; + if (options_owner(o) == oo2) + scope = scope2; else if (options_owner(o) == oo1) scope = scope1; - else if (options_owner(o) == oo2) - scope = scope2; + else + scope = scope0; window_customize_build_option(data, top, scope, o, ft, filter, fs); loop = options_next(loop); @@ -805,7 +805,7 @@ window_customize_set_option(struct client *c, struct window_customize_modedata * struct window_customize_itemdata *item, int global, int pane) { struct options_entry *o; - const struct options_table_entry *oe; + const struct options_table_entry *oe; struct options *oo; struct window_customize_itemdata *new_item; int flag, idx = item->idx; |