From 77f43c78e522365107efaacbf9ace214fc90c349 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 11 Oct 2014 04:59:03 +0200 Subject: [PATCH] Rename setting_data_get_list to setting_data_new --- frontend/menu/menu_common.c | 4 ++-- frontend/menu/menu_entries.c | 13 +++++-------- settings_data.c | 2 +- settings_data.h | 3 ++- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index 22cea89b27..20b41e8d1a 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -188,8 +188,8 @@ bool menu_init_list(void *data) if (!menu) return false; - menu->list_mainmenu = setting_data_get_list(SL_FLAG_MAIN_MENU); - menu->list_settings = setting_data_get_list(SL_FLAG_ALL_SETTINGS); + menu->list_mainmenu = setting_data_new(SL_FLAG_MAIN_MENU); + menu->list_settings = setting_data_new(SL_FLAG_ALL_SETTINGS); file_list_push(menu->menu_stack, "", "mainmenu", MENU_SETTINGS, 0); menu_clear_navigation(menu); diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c index dc244b905a..f888f4dc84 100644 --- a/frontend/menu/menu_entries.c +++ b/frontend/menu/menu_entries.c @@ -179,8 +179,7 @@ int menu_entries_push_list(menu_handle_t *menu, if (!strcmp(label, "mainmenu")) { settings_list_free(menu->list_mainmenu); - menu->list_mainmenu = (rarch_setting_t *) - setting_data_get_list(SL_FLAG_MAIN_MENU); + menu->list_mainmenu = (rarch_setting_t *)setting_data_new(SL_FLAG_MAIN_MENU); rarch_setting_t *setting = (rarch_setting_t*)setting_data_find_setting(menu->list_mainmenu, "Main Menu"); file_list_clear(list); @@ -201,8 +200,7 @@ int menu_entries_push_list(menu_handle_t *menu, else if (menu_type == MENU_FILE_CATEGORY) { settings_list_free(menu->list_settings); - menu->list_settings = (rarch_setting_t *) - setting_data_get_list(SL_FLAG_ALL_SETTINGS); + menu->list_settings = (rarch_setting_t *)setting_data_new(SL_FLAG_ALL_SETTINGS); rarch_setting_t *setting = (rarch_setting_t*)setting_data_find_setting(menu->list_settings, label); @@ -234,8 +232,7 @@ int menu_entries_push_list(menu_handle_t *menu, else if (!strcmp(label, "settings")) { settings_list_free(menu->list_settings); - menu->list_settings = (rarch_setting_t *) - setting_data_get_list(SL_FLAG_ALL_SETTINGS); + menu->list_settings = (rarch_setting_t *)setting_data_new(SL_FLAG_ALL_SETTINGS); rarch_setting_t *setting = (rarch_setting_t*)setting_data_find_setting(menu->list_settings, "Driver Options"); @@ -429,8 +426,8 @@ int menu_entries_push_list(menu_handle_t *menu, else if (!strcmp(label, "Input Options")) { settings_list_free(menu->list_settings); - menu->list_settings = (rarch_setting_t *) - setting_data_get_list(SL_FLAG_ALL_SETTINGS); + menu->list_settings = (rarch_setting_t *)setting_data_new(SL_FLAG_ALL_SETTINGS); + file_list_clear(list); file_list_push(list, "Player", "input_bind_player_no", 0, 0); file_list_push(list, "Device", "input_bind_device_id", 0, 0); diff --git a/settings_data.c b/settings_data.c index 717c644827..226ad7f725 100644 --- a/settings_data.c +++ b/settings_data.c @@ -4548,7 +4548,7 @@ bool setting_data_append_list_privacy_options( return true; } -rarch_setting_t *setting_data_get_list(unsigned mask) +rarch_setting_t *setting_data_new(unsigned mask) { rarch_setting_t terminator = { ST_NONE }; rarch_setting_t* list = NULL; diff --git a/settings_data.h b/settings_data.h index d69e03c81a..0f126ed80a 100644 --- a/settings_data.h +++ b/settings_data.h @@ -91,7 +91,8 @@ void setting_data_get_label(char *type_str, size_t type_str_size, unsigned *w, unsigned type, const char *menu_label, const char *label, unsigned index); #endif -rarch_setting_t* setting_data_get_list(unsigned mask); + +rarch_setting_t* setting_data_new(unsigned mask); #ifdef __cplusplus }