From abb63671502c984282bdb7ab15f61400fe84b4a7 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 28 Aug 2020 20:05:34 +0200
Subject: [PATCH] Remove unused apple_keyboard_find_any_key

---
 input/drivers_keyboard/keyboard_event_apple.c | 36 +++++++-----------
 input/drivers_keyboard/keyboard_event_apple.h |  2 -
 input/drivers_keyboard/keyboard_event_xkb.c   | 37 +++++++++++--------
 3 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/input/drivers_keyboard/keyboard_event_apple.c b/input/drivers_keyboard/keyboard_event_apple.c
index 9f4e5124c4..78f0dcfd32 100644
--- a/input/drivers_keyboard/keyboard_event_apple.c
+++ b/input/drivers_keyboard/keyboard_event_apple.c
@@ -54,6 +54,17 @@ static const unsigned char MAC_NATIVE_TO_HID[128] = {
 uint32_t apple_key_state[MAX_KEYS];
 
 #if TARGET_OS_IPHONE
+typedef struct icade_map
+{
+   bool up;
+   enum retro_key key;
+} icade_map_t;
+
+#define MAX_ICADE_PROFILES 4
+#define MAX_ICADE_KEYS     0x100
+
+static icade_map_t icade_maps[MAX_ICADE_PROFILES][MAX_ICADE_KEYS];
+
 static bool handle_small_keyboard(unsigned* code, bool down)
 {
    static uint8_t mapping[128];
@@ -92,7 +103,8 @@ static bool handle_small_keyboard(unsigned* code, bool down)
       return true;
    }
 
-   translated_code = (*code < 128) ? mapping[*code] : 0;
+   if (*code < 128)
+      translated_code = mapping[*code];
 
    /* Allow old keys to be released. */
    if (!down && apple_key_state[*code])
@@ -108,17 +120,6 @@ static bool handle_small_keyboard(unsigned* code, bool down)
    return false;
 }
 
-typedef struct icade_map
-{
-   bool up;
-   enum retro_key key;
-} icade_map_t;
-
-#define MAX_ICADE_PROFILES 4
-#define MAX_ICADE_KEYS     0x100
-
-static icade_map_t icade_maps[MAX_ICADE_PROFILES][MAX_ICADE_KEYS];
-
 static bool handle_icade_event(unsigned *code, bool *keydown)
 {
    static bool initialized = false;
@@ -305,14 +306,3 @@ void apple_input_keyboard_event(bool down,
          input_keymaps_translate_keysym_to_rk(code),
          character, (enum retro_mod)mod, device);
 }
-
-int32_t apple_keyboard_find_any_key(void)
-{
-   unsigned i;
-
-   for (i = 0; apple_key_name_map[i].hid_id; i++)
-      if (apple_key_state[apple_key_name_map[i].hid_id])
-         return apple_key_name_map[i].hid_id;
-
-   return 0;
-}
diff --git a/input/drivers_keyboard/keyboard_event_apple.h b/input/drivers_keyboard/keyboard_event_apple.h
index fe012efd73..e608799df9 100644
--- a/input/drivers_keyboard/keyboard_event_apple.h
+++ b/input/drivers_keyboard/keyboard_event_apple.h
@@ -169,8 +169,6 @@ RETRO_BEGIN_DECLS
 void apple_input_keyboard_event(bool down,
       unsigned code, uint32_t character, uint32_t mod, unsigned device);
 
-int32_t apple_keyboard_find_any_key(void);
-
 extern uint32_t apple_key_state[MAX_KEYS];
 
 RETRO_END_DECLS
diff --git a/input/drivers_keyboard/keyboard_event_xkb.c b/input/drivers_keyboard/keyboard_event_xkb.c
index 4e4530d1f8..4f7292559c 100644
--- a/input/drivers_keyboard/keyboard_event_xkb.c
+++ b/input/drivers_keyboard/keyboard_event_xkb.c
@@ -86,7 +86,6 @@ int init_xkb(int fd, size_t size)
       }
       else
       {
-         struct string_list list           = {0};
          struct xkb_rule_names rule        = {0};
          settings_t *settings              = config_get_ptr();
          const char *input_keyboard_layout = 
@@ -94,10 +93,11 @@ int init_xkb(int fd, size_t size)
 
          rule.rules = "evdev";
 
-         string_list_initialize(&list);
-
          if (*input_keyboard_layout)
          {
+            struct string_list list        = {0};
+            string_list_initialize(&list);
+
             if (string_split_noalloc(&list, input_keyboard_layout, ":"))
             {
                if (list.size >= 1)
@@ -107,12 +107,12 @@ int init_xkb(int fd, size_t size)
                      rule.variant = list.elems[1].data;
                }
             }
+
+            string_list_deinitialize(&list);
          }
 
          xkb_map = xkb_keymap_new_from_names(xkb_ctx,
                &rule, XKB_MAP_COMPILE_NO_FLAGS);
-
-         string_list_deinitialize(&list);
       }
    }
 
@@ -121,26 +121,31 @@ int init_xkb(int fd, size_t size)
       xkb_mod_index_t *map_idx = (xkb_mod_index_t*)&mod_map_idx[0];
       uint16_t        *map_bit = (uint16_t*)&mod_map_bit[0];
 
-      xkb_state = xkb_state_new(xkb_map);
+      xkb_state                = xkb_state_new(xkb_map);
 
-      *map_idx = xkb_keymap_mod_get_index(xkb_map, XKB_MOD_NAME_CAPS);
+      *map_idx                 = xkb_keymap_mod_get_index(
+            xkb_map, XKB_MOD_NAME_CAPS);
       map_idx++;
-      *map_bit = RETROKMOD_CAPSLOCK;
+      *map_bit                 = RETROKMOD_CAPSLOCK;
       map_bit++;
-      *map_idx = xkb_keymap_mod_get_index(xkb_map, XKB_MOD_NAME_SHIFT);
+      *map_idx                 = xkb_keymap_mod_get_index(
+            xkb_map, XKB_MOD_NAME_SHIFT);
       map_idx++;
-      *map_bit = RETROKMOD_SHIFT;
+      *map_bit                 = RETROKMOD_SHIFT;
       map_bit++;
-      *map_idx = xkb_keymap_mod_get_index(xkb_map, XKB_MOD_NAME_CTRL);
+      *map_idx                 = xkb_keymap_mod_get_index(
+            xkb_map, XKB_MOD_NAME_CTRL);
       map_idx++;
-      *map_bit = RETROKMOD_CTRL;
+      *map_bit                 = RETROKMOD_CTRL;
       map_bit++;
-      *map_idx = xkb_keymap_mod_get_index(xkb_map, XKB_MOD_NAME_ALT);
+      *map_idx                 = xkb_keymap_mod_get_index(
+            xkb_map, XKB_MOD_NAME_ALT);
       map_idx++;
-      *map_bit = RETROKMOD_ALT;
+      *map_bit                 = RETROKMOD_ALT;
       map_bit++;
-      *map_idx = xkb_keymap_mod_get_index(xkb_map, XKB_MOD_NAME_LOGO);
-      *map_bit = RETROKMOD_META;
+      *map_idx                 = xkb_keymap_mod_get_index(
+            xkb_map, XKB_MOD_NAME_LOGO);
+      *map_bit                 = RETROKMOD_META;
    }
 
    return 0;