From 29e74b23725535f021f4badd86466424418d3b75 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 20 Oct 2014 22:45:19 +0200
Subject: [PATCH] See prior commit message

---
 settings.c    | 24 ++++++++++++------------
 string_list.c |  6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/settings.c b/settings.c
index 424ec98b5b..48f8aa84da 100644
--- a/settings.c
+++ b/settings.c
@@ -1290,41 +1290,41 @@ static void parse_config_file(void)
 
 
 static void read_keybinds_keyboard(config_file_t *conf, unsigned player,
-      unsigned index, struct retro_keybind *bind)
+      unsigned idx, struct retro_keybind *bind)
 {
-   if (input_config_bind_map[index].valid && input_config_bind_map[index].base)
+   if (input_config_bind_map[idx].valid && input_config_bind_map[idx].base)
    {
       const char *prefix = input_config_get_prefix(player,
-            input_config_bind_map[index].meta);
+            input_config_bind_map[idx].meta);
       if (prefix)
          input_config_parse_key(conf, prefix,
-               input_config_bind_map[index].base, bind);
+               input_config_bind_map[idx].base, bind);
    }
 }
 
 static void read_keybinds_button(config_file_t *conf, unsigned player,
-      unsigned index, struct retro_keybind *bind)
+      unsigned idx, struct retro_keybind *bind)
 {
-   if (input_config_bind_map[index].valid && input_config_bind_map[index].base)
+   if (input_config_bind_map[idx].valid && input_config_bind_map[idx].base)
    {
       const char *prefix = input_config_get_prefix(player,
-            input_config_bind_map[index].meta);
+            input_config_bind_map[idx].meta);
       if (prefix)
          input_config_parse_joy_button(conf, prefix,
-               input_config_bind_map[index].base, bind);
+               input_config_bind_map[idx].base, bind);
    }
 }
 
 static void read_keybinds_axis(config_file_t *conf, unsigned player,
-      unsigned index, struct retro_keybind *bind)
+      unsigned idx, struct retro_keybind *bind)
 {
-   if (input_config_bind_map[index].valid && input_config_bind_map[index].base)
+   if (input_config_bind_map[idx].valid && input_config_bind_map[idx].base)
    {
       const char *prefix = input_config_get_prefix(player,
-            input_config_bind_map[index].meta);
+            input_config_bind_map[idx].meta);
       if (prefix)
          input_config_parse_joy_axis(conf, prefix,
-               input_config_bind_map[index].base, bind);
+               input_config_bind_map[idx].base, bind);
    }
 }
 
diff --git a/string_list.c b/string_list.c
index 843c0b7966..03b11df476 100644
--- a/string_list.c
+++ b/string_list.c
@@ -86,10 +86,10 @@ bool string_list_append(struct string_list *list, const char *elem,
 }
 
 void string_list_set(struct string_list *list,
-      unsigned index, const char *str)
+      unsigned idx, const char *str)
 {
-   free(list->elems[index].data);
-   rarch_assert(list->elems[index].data = strdup(str));
+   free(list->elems[idx].data);
+   rarch_assert(list->elems[idx].data = strdup(str));
 }
 
 void string_list_join_concat(char *buffer, size_t size,