From 3b262631264dadc5ef9fca8973bd5f1413ae2de5 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 8 Sep 2017 06:28:40 +0200
Subject: [PATCH] Cleanup input_config_get_prefix

---
 input/input_driver.c | 46 +++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/input/input_driver.c b/input/input_driver.c
index ba6ba9a4a9..ac413f3c06 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -209,24 +209,6 @@ struct input_bind_map
    uint8_t retro_key;
 };
 
-static const char *bind_user_prefix[MAX_USERS] = {
-   "input_player1",
-   "input_player2",
-   "input_player3",
-   "input_player4",
-   "input_player5",
-   "input_player6",
-   "input_player7",
-   "input_player8",
-   "input_player9",
-   "input_player10",
-   "input_player11",
-   "input_player12",
-   "input_player13",
-   "input_player14",
-   "input_player15",
-   "input_player16",
-};
 
 static const uint8_t buttons[] = {
    RETRO_DEVICE_ID_JOYPAD_R,
@@ -2147,11 +2129,31 @@ void input_config_parse_key(void *data,
 
 const char *input_config_get_prefix(unsigned user, bool meta)
 {
-   if (user == 0)
-      return meta ? "input" : bind_user_prefix[user];
+   static const char *bind_user_prefix[MAX_USERS] = {
+      "input_player1",
+      "input_player2",
+      "input_player3",
+      "input_player4",
+      "input_player5",
+      "input_player6",
+      "input_player7",
+      "input_player8",
+      "input_player9",
+      "input_player10",
+      "input_player11",
+      "input_player12",
+      "input_player13",
+      "input_player14",
+      "input_player15",
+      "input_player16",
+   };
+   const char *prefix = bind_user_prefix[user];
 
-   if (user != 0 && !meta)
-      return bind_user_prefix[user];
+   if (user == 0)
+      return meta ? "input" : prefix; 
+
+   if (!meta)
+      return prefix;
 
    /* Don't bother with meta bind for anyone else than first user. */
    return NULL;