From 2b55e5858ef7a40b1e89a3cbd925650f0224e445 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 1 Oct 2017 17:25:41 +0200 Subject: [PATCH] Remove menu_entries_get_actiondata_at_offset --- menu/cbs/menu_cbs_left.c | 6 +++--- menu/cbs/menu_cbs_right.c | 2 +- menu/cbs/menu_cbs_select.c | 2 +- menu/drivers/menu_generic.c | 5 +++-- menu/menu_entries.c | 13 ++----------- menu/menu_entries.h | 3 --- menu/menu_input.c | 6 ++---- menu/menu_setting.c | 4 ++-- menu/widgets/menu_entry.c | 8 ++++---- 9 files changed, 18 insertions(+), 31 deletions(-) diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index ac98181654..038fa96c71 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/menu/cbs/menu_cbs_left.c @@ -209,9 +209,9 @@ static int action_left_mainmenu(unsigned type, const char *label, file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); size_t selection = menu_navigation_get_selection(); - menu_file_list_cbs_t *cbs = - menu_entries_get_actiondata_at_offset(selection_buf, - selection); + menu_file_list_cbs_t *cbs = selection_buf ? + file_list_get_actiondata_at_offset(selection_buf, + selection) : NULL; list_info.type = MENU_LIST_HORIZONTAL; list_info.action = MENU_ACTION_LEFT; diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index f3bc4aabff..15829c7732 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/menu/cbs/menu_cbs_right.c @@ -191,7 +191,7 @@ static int action_right_goto_tab(void) file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); size_t selection = menu_navigation_get_selection(); - menu_file_list_cbs_t *cbs = menu_entries_get_actiondata_at_offset(selection_buf, selection); + menu_file_list_cbs_t *cbs = selection_buf ? file_list_get_actiondata_at_offset(selection_buf, selection) : NULL; list_info.type = MENU_LIST_HORIZONTAL; list_info.action = MENU_ACTION_RIGHT; diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c index 57f9d12886..7747a511a6 100644 --- a/menu/cbs/menu_cbs_select.c +++ b/menu/cbs/menu_cbs_select.c @@ -42,7 +42,7 @@ static int action_select_default(const char *path, const char *label, unsigned t menu_entry_init(&entry); menu_entry_get(&entry, 0, idx, NULL, false); - cbs = menu_entries_get_actiondata_at_offset(selection_buf, idx); + cbs = selection_buf ? file_list_get_actiondata_at_offset(selection_buf, idx) : NULL; if (!cbs) { diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c index 1250ad8aac..0e456c7657 100644 --- a/menu/drivers/menu_generic.c +++ b/menu/drivers/menu_generic.c @@ -133,8 +133,9 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action) case ITERATE_TYPE_INFO: { file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); - menu_file_list_cbs_t *cbs = - menu_entries_get_actiondata_at_offset(selection_buf, selection); + menu_file_list_cbs_t *cbs = selection_buf ? + file_list_get_actiondata_at_offset(selection_buf, selection) + : NULL; if (cbs->enum_idx != MSG_UNKNOWN) { diff --git a/menu/menu_entries.c b/menu/menu_entries.c index 72bb7b967b..0ba9693952 100644 --- a/menu/menu_entries.c +++ b/menu/menu_entries.c @@ -44,15 +44,6 @@ void menu_entries_get_at_offset(const file_list_t *list, size_t idx, file_list_get_alt_at_offset(list, idx, alt); } -menu_file_list_cbs_t *menu_entries_get_actiondata_at_offset( - const file_list_t *list, size_t idx) -{ - if (!list) - return NULL; - return (menu_file_list_cbs_t*) - file_list_get_actiondata_at_offset(list, idx); -} - static bool menu_entries_clear(file_list_t *list) { unsigned i; @@ -509,8 +500,8 @@ size_t menu_entries_get_size(void) rarch_setting_t *menu_entries_get_setting(uint32_t i) { file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); - menu_file_list_cbs_t *cbs = - menu_entries_get_actiondata_at_offset(selection_buf, i); + menu_file_list_cbs_t *cbs = selection_buf ? + file_list_get_actiondata_at_offset(selection_buf, i) : NULL; if (!cbs) return NULL; diff --git a/menu/menu_entries.h b/menu/menu_entries.h index 3cd0d11770..11ebd60b7b 100644 --- a/menu/menu_entries.h +++ b/menu/menu_entries.h @@ -145,9 +145,6 @@ void menu_entries_get_at_offset(const file_list_t *list, size_t idx, const char **path, const char **label, unsigned *file_type, size_t *entry_idx, const char **alt); -menu_file_list_cbs_t *menu_entries_get_actiondata_at_offset( - const file_list_t *list, size_t idx); - void menu_entries_set_alt_at_offset(file_list_t *list, size_t idx, const char *alt); diff --git a/menu/menu_input.c b/menu/menu_input.c index 4aace7f1eb..d25904815d 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -563,13 +563,11 @@ static int menu_input_pointer_post_iterate( void menu_input_post_iterate(int *ret, unsigned action) { menu_entry_t entry; - menu_file_list_cbs_t *cbs = NULL; settings_t *settings = config_get_ptr(); file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); size_t selection = menu_navigation_get_selection(); - - if (selection_buf) - cbs = menu_entries_get_actiondata_at_offset(selection_buf, selection); + menu_file_list_cbs_t *cbs = selection_buf ? + file_list_get_actiondata_at_offset(selection_buf, selection) : NULL; menu_entry_init(&entry); menu_entry_get(&entry, 0, selection, NULL, false); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 68da07a0dc..ffd748fefe 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -916,8 +916,8 @@ int menu_setting_set(unsigned type, const char *label, int ret = 0; file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); size_t selection = menu_navigation_get_selection(); - menu_file_list_cbs_t *cbs = menu_entries_get_actiondata_at_offset( - selection_buf, selection); + menu_file_list_cbs_t *cbs = selection_buf ? + file_list_get_actiondata_at_offset(selection_buf, selection) : NULL; if (!cbs) return 0; diff --git a/menu/widgets/menu_entry.c b/menu/widgets/menu_entry.c index 3ed41ccb32..eb6436a1a1 100644 --- a/menu/widgets/menu_entry.c +++ b/menu/widgets/menu_entry.c @@ -313,7 +313,7 @@ void menu_entry_get(menu_entry_t *entry, size_t stack_idx, menu_entries_get_at_offset(list, i, &path, &entry_label, &entry->type, &entry->entry_idx, NULL); - cbs = menu_entries_get_actiondata_at_offset(list, i); + cbs = list ? file_list_get_actiondata_at_offset(list, i) : NULL; if (cbs) { @@ -417,8 +417,8 @@ int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action) int ret = 0; file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); - menu_file_list_cbs_t *cbs = - menu_entries_get_actiondata_at_offset(selection_buf, i); + menu_file_list_cbs_t *cbs = selection_buf ? + file_list_get_actiondata_at_offset(selection_buf, i) : NULL; switch (action) { @@ -482,7 +482,7 @@ int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action) break; } - cbs = menu_entries_get_actiondata_at_offset(selection_buf, i); + cbs = selection_buf ? file_list_get_actiondata_at_offset(selection_buf, i) : NULL; if (menu_entries_ctl(MENU_ENTRIES_CTL_NEEDS_REFRESH, NULL)) {