From 6131dde4d84a431418b5d3b5fb3976b8405d3e08 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 17 Jun 2016 01:07:52 +0200 Subject: [PATCH] Cleanup --- menu/menu_entries.c | 3 +-- menu/menu_setting.c | 9 +++------ menu/menu_setting.h | 3 ++- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/menu/menu_entries.c b/menu/menu_entries.c index 4a3c42acff..aa3139a291 100644 --- a/menu/menu_entries.c +++ b/menu/menu_entries.c @@ -728,8 +728,7 @@ bool menu_entries_ctl(enum menu_entries_ctl_state state, void *data) } break; case MENU_ENTRIES_CTL_SETTINGS_DEINIT: - if (menu_entries_list_settings) - menu_setting_ctl(MENU_SETTING_CTL_FREE, menu_entries_list_settings); + menu_setting_free(menu_entries_list_settings); menu_entries_list_settings = NULL; break; case MENU_ENTRIES_CTL_SETTINGS_INIT: diff --git a/menu/menu_setting.c b/menu/menu_setting.c index e164c9f6c4..4a73670d5e 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -8031,13 +8031,12 @@ static bool setting_append_list( return true; } -static bool menu_setting_free(void *data) +bool menu_setting_free(void *data) { + unsigned values, n; rarch_setting_t *setting = (rarch_setting_t*)data; - unsigned values; - unsigned n; - if (!data) + if (!setting) return false; /* Free data which was previously tagged */ @@ -8200,8 +8199,6 @@ bool menu_setting_ctl(enum menu_setting_ctl_state state, void *data) return false; } break; - case MENU_SETTING_CTL_FREE: - return menu_setting_free(data); case MENU_SETTING_CTL_NEW: { rarch_setting_t **setting = (rarch_setting_t**)data; diff --git a/menu/menu_setting.h b/menu/menu_setting.h index 290735b0eb..ffb31dd255 100644 --- a/menu/menu_setting.h +++ b/menu/menu_setting.h @@ -75,7 +75,6 @@ enum settings_free_flags enum menu_setting_ctl_state { MENU_SETTING_CTL_NONE = 0, - MENU_SETTING_CTL_FREE, MENU_SETTING_CTL_NEW, MENU_SETTING_CTL_IS_OF_PATH_TYPE, MENU_SETTING_CTL_ACTION_RIGHT @@ -395,6 +394,8 @@ void menu_settings_list_current_add_enum_idx( rarch_setting_info_t *list_info, enum menu_hash_enums enum_idx); +bool menu_setting_free(void *data); + bool menu_setting_ctl(enum menu_setting_ctl_state state, void *data); RETRO_END_DECLS