From df15a67c715c54023501ab4635234eaa160296cc Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 1 Oct 2017 17:20:01 +0200
Subject: [PATCH] Remove menu_entries_get_last
---
menu/cbs/menu_cbs_ok.c | 7 ++++---
menu/menu_entries.c | 10 +---------
menu/menu_entries.h | 4 ----
menu/widgets/menu_list.c | 4 ++--
4 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 297a1ca569..d8d0269bf9 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1382,7 +1382,7 @@ static int action_ok_file_load(const char *path,
menu_path_new[0] = full_path_new[0] = '\0';
- menu_entries_get_last(menu_stack, &menu_path, &menu_label, NULL, NULL);
+ file_list_get_last(menu_stack, &menu_path, &menu_label, NULL, NULL);
if (menu_label && !string_is_empty(menu_label))
setting = menu_setting_find(menu_label);
@@ -2415,7 +2415,7 @@ static int action_ok_file_load_ffmpeg(const char *path,
const char *menu_path = NULL;
file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0);
- menu_entries_get_last(menu_stack, &menu_path, NULL, NULL, NULL);
+ file_list_get_last(menu_stack, &menu_path, NULL, NULL, NULL);
new_path[0] = '\0';
@@ -2476,7 +2476,8 @@ static int action_ok_file_load_imageviewer(const char *path,
content_ctx_info_t content_info;
const char *menu_path = NULL;
file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0);
- menu_entries_get_last(menu_stack, &menu_path, NULL, NULL, NULL);
+
+ file_list_get_last(menu_stack, &menu_path, NULL, NULL, NULL);
fullpath[0] = '\0';
diff --git a/menu/menu_entries.c b/menu/menu_entries.c
index bc93186ad3..72bb7b967b 100644
--- a/menu/menu_entries.c
+++ b/menu/menu_entries.c
@@ -44,14 +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);
}
-void menu_entries_get_last(const file_list_t *list,
- const char **path, const char **label,
- unsigned *file_type, size_t *entry_idx)
-{
- if (list)
- file_list_get_last(list, path, label, file_type, entry_idx);
-}
-
menu_file_list_cbs_t *menu_entries_get_actiondata_at_offset(
const file_list_t *list, size_t idx)
{
@@ -477,7 +469,7 @@ void menu_entries_get_last_stack(const char **path, const char **label,
if (!menu_list)
return;
- menu_entries_get_last(menu_list_get(menu_list, 0),
+ file_list_get_last(menu_list_get(menu_list, 0),
path, label, file_type, entry_idx);
cbs = menu_entries_get_last_stack_actiondata();
if (cbs && enum_idx)
diff --git a/menu/menu_entries.h b/menu/menu_entries.h
index a2a56077a0..3cd0d11770 100644
--- a/menu/menu_entries.h
+++ b/menu/menu_entries.h
@@ -148,10 +148,6 @@ void menu_entries_get_at_offset(const file_list_t *list, size_t idx,
menu_file_list_cbs_t *menu_entries_get_actiondata_at_offset(
const file_list_t *list, size_t idx);
-void menu_entries_get_last(const file_list_t *list,
- const char **path, const char **label,
- unsigned *file_type, size_t *entry_idx);
-
void menu_entries_set_alt_at_offset(file_list_t *list, size_t idx,
const char *alt);
diff --git a/menu/widgets/menu_list.c b/menu/widgets/menu_list.c
index 24b6b92505..4357e3f0b6 100644
--- a/menu/widgets/menu_list.c
+++ b/menu/widgets/menu_list.c
@@ -154,7 +154,7 @@ void menu_list_flush_stack(menu_list_t *list,
return;
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
- menu_entries_get_last(menu_list,
+ file_list_get_last(menu_list,
&path, &label, &type, &entry_idx);
while (menu_list_flush_stack_type(
@@ -169,7 +169,7 @@ void menu_list_flush_stack(menu_list_t *list,
menu_list = menu_list_get(list, (unsigned)idx);
- menu_entries_get_last(menu_list,
+ file_list_get_last(menu_list,
&path, &label, &type, &entry_idx);
}
}