From 14e46e0048d2e5acdbaf7a4f09ae9145c3c58240 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 18 Oct 2015 21:54:20 +0200
Subject: [PATCH] Remove menu_list_get_alt_at_offset

---
 libretro-common/file/file_list.c |  2 +-
 menu/cbs/menu_cbs_get_value.c    | 10 ++++++++--
 menu/menu_displaylist.c          |  3 ++-
 menu/menu_entries.c              | 19 +++++++------------
 menu/menu_entries.h              |  7 ++-----
 menu/menu_entry.c                |  4 ++--
 6 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/libretro-common/file/file_list.c b/libretro-common/file/file_list.c
index 5279bf2651..0151380db6 100644
--- a/libretro-common/file/file_list.c
+++ b/libretro-common/file/file_list.c
@@ -235,7 +235,7 @@ void file_list_get_label_at_offset(const file_list_t *list, size_t idx,
 void file_list_set_alt_at_offset(file_list_t *list, size_t idx,
       const char *alt)
 {
-   if (!list)
+   if (!list || !alt)
       return;
 
    if (list->list[idx].alt)
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index 62486e59be..1f79bcc441 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -361,7 +361,10 @@ static void menu_action_setting_disp_set_label_menu_file_core(
 {
    const char *alt = NULL;
    strlcpy(s, "(CORE)", len);
-   menu_list_get_alt_at_offset(list, i, &alt);
+
+   menu_entries_get_at_offset(list, i, NULL,
+         NULL, NULL, NULL, &alt);
+
    *w = strlen(s);
    if (alt)
       strlcpy(s2, alt, len2);
@@ -847,7 +850,10 @@ static void menu_action_setting_disp_set_label_menu_file_url_core(
 {
    const char *alt = NULL;
    strlcpy(s, "(CORE)", len);
-   menu_list_get_alt_at_offset(list, i, &alt);
+
+   menu_entries_get_at_offset(list, i, NULL,
+         NULL, NULL, NULL, &alt);
+
    *w = strlen(s);
    if (alt)
       strlcpy(s2, alt, len2);
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 50c30423e1..abf6f136f4 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -2193,7 +2193,8 @@ static int menu_displaylist_parse_generic(menu_displaylist_info_t *info, bool *n
                unsigned type                      = 0;
                const char *path                   = NULL;
 
-               menu_list_get_at_offset(info->list, i, &path, NULL, &type, NULL);
+               menu_entries_get_at_offset(info->list, i, &path, NULL, &type, NULL,
+                     NULL);
 
                if (type != MENU_FILE_CORE)
                   continue;
diff --git a/menu/menu_entries.c b/menu/menu_entries.c
index 5afe145b01..ba0a1f9ac2 100644
--- a/menu/menu_entries.c
+++ b/menu/menu_entries.c
@@ -98,11 +98,12 @@ static size_t menu_list_get_stack_size(menu_list_t *list)
    return file_list_get_size(list->menu_stack);
 }
 
-void menu_list_get_at_offset(const file_list_t *list, size_t idx,
+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)
+      size_t *entry_idx, const char **alt)
 {
    file_list_get_at_offset(list, idx, path, label, file_type, entry_idx);
+   file_list_get_alt_at_offset(list, idx, alt);
 }
 
 void menu_list_get_last(const file_list_t *list,
@@ -214,12 +215,6 @@ void menu_list_set_alt_at_offset(file_list_t *list, size_t idx,
    file_list_set_alt_at_offset(list, idx, alt);
 }
 
-void menu_list_get_alt_at_offset(const file_list_t *list, size_t idx,
-      const char **alt)
-{
-   file_list_get_alt_at_offset(list, idx, alt);
-}
-
 /**
  * menu_list_elem_is_dir:
  * @list                     : File list handle.
@@ -234,7 +229,7 @@ static bool menu_list_elem_is_dir(file_list_t *list,
 {
    unsigned type     = 0;
 
-   menu_list_get_at_offset(list, offset, NULL, NULL, &type, NULL);
+   menu_entries_get_at_offset(list, offset, NULL, NULL, &type, NULL, NULL);
 
    return type == MENU_FILE_DIRECTORY;
 }
@@ -255,7 +250,7 @@ static int menu_list_elem_get_first_char(
    int ret;
    const char *path = NULL;
 
-   menu_list_get_alt_at_offset(list, offset, &path);
+   file_list_get_alt_at_offset(list, offset, &path);
    ret = tolower((int)*path);
 
    /* "Normalize" non-alphabetical entries so they
@@ -398,8 +393,8 @@ void menu_entries_get(size_t i, menu_entry_t *entry)
 
    entry->path[0] = entry->value[0] = entry->label[0] = '\0';
 
-   menu_list_get_at_offset(selection_buf, i,
-         &path, &entry_label, &entry->type, &entry->entry_idx);
+   menu_entries_get_at_offset(selection_buf, i,
+         &path, &entry_label, &entry->type, &entry->entry_idx, NULL);
 
    cbs = menu_list_get_actiondata_at_offset(selection_buf, i);
 
diff --git a/menu/menu_entries.h b/menu/menu_entries.h
index 60bf11d80b..4dae71a371 100644
--- a/menu/menu_entries.h
+++ b/menu/menu_entries.h
@@ -153,9 +153,9 @@ size_t menu_entries_get_stack_size(void);
 
 size_t menu_entries_get_size(void);
 
-void menu_list_get_at_offset(const file_list_t *list, size_t idx,
+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);
+      size_t *entry_idx, const char **alt);
 
 menu_list_t *menu_list_get_ptr(void);
 
@@ -169,9 +169,6 @@ void menu_list_get_last(const file_list_t *list,
 
 void menu_entries_clear(file_list_t *list);
 
-void menu_list_get_alt_at_offset(const file_list_t *list, size_t idx,
-      const char **alt);
-
 void menu_list_set_alt_at_offset(file_list_t *list, size_t idx,
       const char *alt);
 
diff --git a/menu/menu_entry.c b/menu/menu_entry.c
index b68dba8495..2742dc6a5e 100644
--- a/menu/menu_entry.c
+++ b/menu/menu_entry.c
@@ -296,8 +296,8 @@ void menu_entry_get(menu_entry_t *entry, size_t i,
    if (!list)
       return;
 
-   menu_list_get_at_offset(list, i, &path, &entry_label, &entry->type,
-         &entry->entry_idx);
+   menu_entries_get_at_offset(list, i, &path, &entry_label, &entry->type,
+         &entry->entry_idx, NULL);
 
    cbs = menu_list_get_actiondata_at_offset(list, i);