From 9d22d2efcea7ed95991ce4417d0feea2e2529af5 Mon Sep 17 00:00:00 2001 From: Orestis Floros Date: Fri, 16 Mar 2018 03:08:47 +0200 Subject: [PATCH] Reduce repetition in get_binding() --- src/bindings.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/bindings.c b/src/bindings.c index c145b956..9edc04dc 100644 --- a/src/bindings.c +++ b/src/bindings.c @@ -227,9 +227,9 @@ static Binding *get_binding(i3_event_state_mask_t state_filtered, bool is_releas /* For keyboard bindings where a symbol was specified by the user, we * need to look in the array of translated keycodes for the event’s * keycode */ + bool found_keycode = false; if (input_type == B_KEYBOARD && bind->symbol != NULL) { xcb_keycode_t input_keycode = (xcb_keycode_t)input_code; - bool found_keycode = false; struct Binding_Keycode *binding_keycode; TAILQ_FOREACH(binding_keycode, &(bind->keycodes_head), keycodes) { const uint32_t modifiers_mask = (binding_keycode->modifiers & 0x0000FFFF); @@ -241,16 +241,12 @@ static Binding *get_binding(i3_event_state_mask_t state_filtered, bool is_releas break; } } - if (!found_keycode) { - continue; - } } else { /* This case is easier: The user specified a keycode */ if (bind->keycode != input_code) { continue; } - bool found_keycode = false; struct Binding_Keycode *binding_keycode; TAILQ_FOREACH(binding_keycode, &(bind->keycodes_head), keycodes) { const uint32_t modifiers_mask = (binding_keycode->modifiers & 0x0000FFFF); @@ -262,9 +258,9 @@ static Binding *get_binding(i3_event_state_mask_t state_filtered, bool is_releas break; } } - if (!found_keycode) { - continue; - } + } + if (!found_keycode) { + continue; } /* If this binding is a release binding, it matches the key which the -- 2.39.5