From 63e2eab86be89ac9d110c7bb53496affc14ffdf5 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 12 Jan 2015 17:14:06 +0100
Subject: [PATCH] Add joypad_driver_find_handle/joypad_driver_find_ident

---
 driver.c | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/driver.c b/driver.c
index 5b6474c873..792e8b5d78 100644
--- a/driver.c
+++ b/driver.c
@@ -712,6 +712,35 @@ const char* config_get_menu_driver_options(void)
 }
 #endif
 
+/**
+ * joypad_driver_find_handle:
+ * @index              : index of driver to get handle to.
+ *
+ * Returns: handle to joypad driver at index. Can be NULL
+ * if nothing found.
+ **/
+static const void *joypad_driver_find_handle(int index)
+{
+   const void *drv = joypad_drivers[index];
+   if (!drv)
+      return NULL;
+   return drv;
+}
+
+/**
+ * joypad_driver_find_ident:
+ * @index              : index of driver to get handle to.
+ *
+ * Returns: Human-readable identifier of joypad driver at index. Can be NULL
+ * if nothing found.
+ **/
+static const char *joypad_driver_find_ident(int index)
+{
+   const rarch_joypad_driver_t *drv = joypad_drivers[index];
+   if (!drv)
+      return NULL;
+   return drv->ident;
+}
 
 /**
  * find_driver_nonempty:
@@ -765,9 +794,9 @@ static const void *find_driver_nonempty(const char *label, int i,
    }
    else if (!strcmp(label, "input_joypad_driver"))
    {
-      drv = joypad_drivers[i];
+      drv = joypad_driver_find_handle(i);
       if (drv)
-         strlcpy(str, joypad_drivers[i]->ident, sizeof_str);
+         strlcpy(str, joypad_driver_find_ident(i), sizeof_str);
    }
    else if (!strcmp(label, "video_driver"))
    {