From d6aa625814e8948099b982f66489f3a19a49ce3b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 30 Aug 2014 02:25:55 +0200
Subject: [PATCH] (Menu) Move get_last_setting to menu_common_backend.c

---
 file_list.c                                 |  9 ---------
 file_list.h                                 |  3 ---
 frontend/menu/backend/menu_common_backend.c | 17 +++++++++++++----
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/file_list.c b/file_list.c
index a161383dd8..f309c957d8 100644
--- a/file_list.c
+++ b/file_list.c
@@ -149,15 +149,6 @@ void file_list_get_last(const file_list_t *list,
       file_list_get_at_offset(list, list->size - 1, path, file_type);
 }
 
-void *file_list_get_last_setting(const file_list_t *list, int index,
-      void *settings)
-{
-   if (settings)
-      return (rarch_setting_t*)setting_data_find_setting(settings,
-            list->list[index].label);
-   return NULL;
-}
-
 bool file_list_search(const file_list_t *list, const char *needle, size_t *index)
 {
    size_t i;
diff --git a/file_list.h b/file_list.h
index be05766c23..2e0687fe31 100644
--- a/file_list.h
+++ b/file_list.h
@@ -67,9 +67,6 @@ void file_list_sort_on_alt(file_list_t *list);
 
 bool file_list_search(const file_list_t *list, const char *needle, size_t *index);
 
-void *file_list_get_last_setting(const file_list_t *list, int index,
-      void *settings);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index f06717c3d6..f7de90d680 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -513,6 +513,15 @@ static void menu_common_entries_init(menu_handle_t *menu, unsigned menu_type)
       driver.menu_ctx->populate_entries(menu, menu_type);
 }
 
+static void *get_last_setting(const file_list_t *list, int index,
+      rarch_setting_t *settings)
+{
+   if (settings)
+      return (rarch_setting_t*)setting_data_find_setting(settings,
+            list->list[index].label);
+   return NULL;
+}
+
 static int menu_info_screen_iterate(unsigned action)
 {
    char msg[PATH_MAX];
@@ -525,7 +534,7 @@ static int menu_info_screen_iterate(unsigned action)
    if (driver.video_data && driver.menu_ctx && driver.menu_ctx->render)
       driver.menu_ctx->render();
 
-   current_setting = (rarch_setting_t*)file_list_get_last_setting(
+   current_setting = (rarch_setting_t*)get_last_setting(
          driver.menu->selection_buf,
          driver.menu->selection_ptr,
          setting_data_get_list());
@@ -534,7 +543,7 @@ static int menu_info_screen_iterate(unsigned action)
       setting_data_get_description(current_setting, msg, sizeof(msg));
    else
    {
-      current_setting = (rarch_setting_t*)file_list_get_last_setting(
+      current_setting = (rarch_setting_t*)get_last_setting(
             driver.menu->selection_buf,
             driver.menu->selection_ptr,
             setting_data_get_mainmenu(true));
@@ -2932,7 +2941,7 @@ static int menu_common_setting_set(unsigned id, unsigned action)
 {
    struct retro_perf_counter **counters;
    unsigned port = driver.menu->current_pad;
-   rarch_setting_t *setting = (rarch_setting_t*)file_list_get_last_setting(
+   rarch_setting_t *setting = (rarch_setting_t*)get_last_setting(
          driver.menu->selection_buf, driver.menu->selection_ptr,
          setting_data_get_list()
          );
@@ -2992,7 +3001,7 @@ static int menu_common_setting_set(unsigned id, unsigned action)
       handle_setting(setting, id, action);
    else
    {
-      setting = (rarch_setting_t*)file_list_get_last_setting(
+      setting = (rarch_setting_t*)get_last_setting(
             driver.menu->selection_buf, driver.menu->selection_ptr,
             setting_data_get_mainmenu(true)
             );