circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-14 02:48:47 +00:00
Code Issues Projects Releases Wiki Activity

Fix some warnings, from Jan Polensky.

Browse Source
This commit is contained in:
Nicholas Marriott 2020-05-09 14:33:25 +01:00
parent 5e97d79eb1
commit ca18990826
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
window-customize.c
View File

@ -268,7 +268,7 @@ window_customize_build_option(struct window_customize_modedata *data,
if (oe != NULL && oe->unit != NULL) if (oe != NULL && oe->unit != NULL)
format_add(ft, "option_unit", "%s", oe->unit); format_add(ft, "option_unit", "%s", oe->unit);
else else
format_add(ft, "option_unit", ""); format_add(ft, "option_unit", "%s", "");
if (!array) { if (!array) {
value = options_to_string(o, -1, 0); 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]); o = options_get(oo1, list[i]);
else else
o = options_get(oo2, list[i]); o = options_get(oo2, list[i]);
if (options_owner(o) == oo0) if (options_owner(o) == oo2)
scope = scope0; scope = scope2;
else if (options_owner(o) == oo1) else if (options_owner(o) == oo1)
scope = scope1; scope = scope1;
else if (options_owner(o) == oo2) else
scope = scope2; scope = scope0;
window_customize_build_option(data, top, scope, o, ft, filter, window_customize_build_option(data, top, scope, o, ft, filter,
fs); fs);
} }
@ -391,12 +391,12 @@ window_customize_build_options(struct window_customize_modedata *data,
o = options_get(oo1, name); o = options_get(oo1, name);
else else
o = loop; o = loop;
if (options_owner(o) == oo0) if (options_owner(o) == oo2)
scope = scope0; scope = scope2;
else if (options_owner(o) == oo1) else if (options_owner(o) == oo1)
scope = scope1; scope = scope1;
else if (options_owner(o) == oo2) else
scope = scope2; scope = scope0;
window_customize_build_option(data, top, scope, o, ft, filter, window_customize_build_option(data, top, scope, o, ft, filter,
fs); fs);
loop = options_next(loop); 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 window_customize_itemdata *item, int global, int pane)
{ {
struct options_entry *o; struct options_entry *o;
const struct options_table_entry *oe; const struct options_table_entry *oe;
struct options *oo; struct options *oo;
struct window_customize_itemdata *new_item; struct window_customize_itemdata *new_item;
int flag, idx = item->idx; int flag, idx = item->idx;