From cdd2edb608991ba0117f1493323c7ace53d3df76 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 12 Jun 2015 17:55:11 +0200
Subject: [PATCH] Rename menu_settings_list_free to menu_setting_free

---
 menu/menu.c             |  5 +++--
 menu/menu_displaylist.c |  8 +++++---
 menu/menu_setting.c     | 13 +++++++------
 menu/menu_setting.h     |  3 ++-
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/menu/menu.c b/menu/menu.c
index f18fc27212..9eb739a8cb 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -216,10 +216,11 @@ static void menu_free_list(menu_handle_t *menu)
    if (!menu)
       return;
 
-   menu_settings_list_free(menu->list_settings);
+   menu_setting_free(menu->list_settings);
    menu_list_free(menu->menu_list);
-   menu->menu_list     = NULL;
+
    menu->list_settings = NULL;
+   menu->menu_list     = NULL;
 }
 
 /**
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 9d100e9946..a82d435dff 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -1248,7 +1248,7 @@ static int menu_displaylist_parse_settings(menu_handle_t *menu,
    settings_t *settings     = config_get_ptr();
 
    if (menu && menu->list_settings)
-      menu_settings_list_free(menu->list_settings);
+      menu_setting_free(menu->list_settings);
 
    menu->list_settings      = menu_setting_new(setting_flags);
    setting                  = menu_setting_find(info->label);
@@ -1301,7 +1301,8 @@ static int menu_displaylist_parse_settings_in_subgroup(menu_displaylist_info_t *
       }
    }
 
-   menu_settings_list_free(menu->list_settings);
+   if (menu->list_settings)
+      menu_setting_free(menu->list_settings);
    menu->list_settings = menu_setting_new(SL_FLAG_ALL_SETTINGS);
 
    info->setting = menu_setting_find(elem0);
@@ -1902,7 +1903,8 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
          break;
       case DISPLAYLIST_SETTINGS_ALL:
          menu_list_clear(info->list);
-         menu_settings_list_free(menu->list_settings);
+         if (menu->list_settings)
+            menu_setting_free(menu->list_settings);
          menu->list_settings = menu_setting_new(SL_FLAG_ALL_SETTINGS);
 
          setting = menu_setting_find("Driver Settings");
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 2648c1c30c..601cf09662 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -127,11 +127,6 @@ static void menu_settings_list_current_add_cmd(
    (*list)[idx].cmd_trigger.idx = values;
 }
 
-void menu_settings_list_free(rarch_setting_t *list)
-{
-   if (list)
-      free(list);
-}
 
 static rarch_setting_t *menu_setting_list_new(unsigned size)
 {
@@ -7048,6 +7043,12 @@ static bool setting_append_list_input_player_options(
    return true;
 }
 
+void menu_setting_free(rarch_setting_t *list)
+{
+   if (list)
+      free(list);
+}
+
 /**
  * menu_setting_new:
  * @mask               : Bitmask of settings to include.
@@ -7256,7 +7257,7 @@ rarch_setting_t *menu_setting_new(unsigned mask)
 error:
    RARCH_ERR("Allocation failed.\n");
    menu_settings_info_list_free(list_info);
-   menu_settings_list_free(list);
+   menu_setting_free(list);
 
    return NULL;
 }
diff --git a/menu/menu_setting.h b/menu/menu_setting.h
index 8b6535493d..833b5f9667 100644
--- a/menu/menu_setting.h
+++ b/menu/menu_setting.h
@@ -215,7 +215,6 @@ typedef struct rarch_setting
 }  rarch_setting_t;
 
 
-void menu_settings_list_free(rarch_setting_t *list);
 
 void menu_setting_apply_deferred(void);
 
@@ -290,6 +289,8 @@ void setting_get_label(file_list_t *list, char *s,
       size_t len, unsigned *w, unsigned type, 
       const char *menu_label, const char *label, unsigned idx);
 
+void menu_setting_free(rarch_setting_t *list);;
+
 /**
  * setting_new:
  * @mask               : Bitmask of settings to include.