From 90bec70e7f186f0e9dbf9e03e555ba50352caff2 Mon Sep 17 00:00:00 2001 From: NRK Date: Fri, 24 Dec 2021 06:14:12 +0600 Subject: fix -Wshadow related warnings fixes all -Wshadow related warnings (on gcc). this would allow us to use `-Wshadow` in github workflow (https://github.com/nsxiv/nsxiv/pull/195). i've thought about adding `-Wshadow` to our Makefile as well, but decided against it to keep the Makefile CFLAGS barebore/minimal. --- main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 34c0254..f8c727f 100644 --- a/main.c +++ b/main.c @@ -605,19 +605,19 @@ end: return true; } -static bool process_bindings(const keymap_t *keys, unsigned int len, KeySym ksym_or_button, +static bool process_bindings(const keymap_t *bindings, unsigned int len, KeySym ksym_or_button, unsigned int state, unsigned int implicit_mod) { unsigned int i; bool dirty = false; for (i = 0; i < len; i++) { - if (keys[i].ksym_or_button == ksym_or_button && - MODMASK(keys[i].mask | implicit_mod) == MODMASK(state) && - keys[i].cmd.func && - (keys[i].cmd.mode == MODE_ALL || keys[i].cmd.mode == mode)) + if (bindings[i].ksym_or_button == ksym_or_button && + MODMASK(bindings[i].mask | implicit_mod) == MODMASK(state) && + bindings[i].cmd.func && + (bindings[i].cmd.mode == MODE_ALL || bindings[i].cmd.mode == mode)) { - if (keys[i].cmd.func(keys[i].arg)) + if (bindings[i].cmd.func(bindings[i].arg)) dirty = true; } } -- cgit v1.2.3-70-g09d2