mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify action_iterate_info

Browse Source
This commit is contained in:
twinaphex 2015-08-17 22:10:12 +02:00
parent 7738b7e2f4
commit 900d537351
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
menu/cbs/menu_cbs_iterate.c
View File

@ -171,7 +171,6 @@ static int action_iterate_help(char *s, size_t len, const char *label)
static int action_iterate_info(char *s, size_t len, const char *label) static int action_iterate_info(char *s, size_t len, const char *label)
{ {
uint32_t label_hash = 0; uint32_t label_hash = 0;
char needle[PATH_MAX_LENGTH] = {0};
menu_file_list_cbs_t *cbs = NULL; menu_file_list_cbs_t *cbs = NULL;
menu_list_t *menu_list = menu_list_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr();
size_t i = menu_navigation_get_current_selection(); size_t i = menu_navigation_get_current_selection();
@ -182,19 +181,12 @@ static int action_iterate_info(char *s, size_t len, const char *label)
cbs = menu_list_get_actiondata_at_offset(menu_list->selection_buf, i); cbs = menu_list_get_actiondata_at_offset(menu_list->selection_buf, i);
if (cbs->setting) if (cbs->setting)
strlcpy(needle, cbs->setting->name, sizeof(needle));
else
{ {
const char *lbl = NULL; char needle[PATH_MAX_LENGTH];
menu_list_get_at_offset(menu_list->selection_buf, strlcpy(needle, cbs->setting->name, sizeof(needle));
i, NULL, &lbl, NULL, NULL); label_hash = menu_hash_calculate(needle);
if (lbl)
strlcpy(needle, lbl, sizeof(needle));
} }
label_hash = menu_hash_calculate(needle);
return menu_hash_get_help(label_hash, s, len); return menu_hash_get_help(label_hash, s, len);
} }
@ -423,7 +415,7 @@ static enum action_iterate_type action_iterate_type(uint32_t hash)
static int action_iterate_main(const char *label, unsigned action) static int action_iterate_main(const char *label, unsigned action)
{ {
menu_entry_t entry; menu_entry_t entry;
char msg[PATH_MAX_LENGTH]; char msg[PATH_MAX_LENGTH] = {0};
static bool did_messagebox = false; static bool did_messagebox = false;
enum action_iterate_type iterate_type; enum action_iterate_type iterate_type;
size_t selected; size_t selected;