libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-03 07:22:15 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Rename menu_settings_list_free to menu_setting_free

Browse Source
This commit is contained in:
twinaphex 2015-06-12 17:55:11 +02:00
parent 5789fb44f4
commit cdd2edb608
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
menu/menu.c
View File

@ -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;
}
/**

8
menu/menu_displaylist.c
View File

@ -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");

13
menu/menu_setting.c
View File

@ -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;
}

3
menu/menu_setting.h
View File

@ -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.