mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of file_list_get_alt_at_offset

Browse Source
This commit is contained in:
twinaphex 2019-08-20 06:13:33 +02:00
parent 74c79e3962
commit d8860104d3
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libretro-common/include/lists/file_list.h
View File

@ -132,9 +132,6 @@ void file_list_set_userdata(const file_list_t *list, size_t idx, void *ptr);
void file_list_set_actiondata(const file_list_t *list, size_t idx, void *ptr); void file_list_set_actiondata(const file_list_t *list, size_t idx, void *ptr);
void file_list_get_alt_at_offset(const file_list_t *list, size_t index,
const char **alt);
void file_list_sort_on_alt(file_list_t *list); void file_list_sort_on_alt(file_list_t *list);
void file_list_sort_on_type(file_list_t *list); void file_list_sort_on_type(file_list_t *list);

14
libretro-common/lists/file_list.c
View File

@ -265,15 +265,6 @@ void file_list_set_alt_at_offset(file_list_t *list, size_t idx,
list->list[idx].alt = strdup(alt); list->list[idx].alt = strdup(alt);
} }
void file_list_get_alt_at_offset(const file_list_t *list, size_t idx,
const char **alt)
{
if (list && alt)
*alt = list->list[idx].alt
? list->list[idx].alt
: list->list[idx].path;
}
static int file_list_alt_cmp(const void *a_, const void *b_) static int file_list_alt_cmp(const void *a_, const void *b_)
{ {
const struct item_file *a = (const struct item_file*)a_; const struct item_file *a = (const struct item_file*)a_;
@ -384,7 +375,6 @@ void file_list_get_last(const file_list_t *list,
bool file_list_search(const file_list_t *list, const char *needle, size_t *idx) bool file_list_search(const file_list_t *list, const char *needle, size_t *idx)
{ {
size_t i; size_t i;
const char *alt = NULL;
bool ret = false; bool ret = false;
if (!list) if (!list)
@ -393,8 +383,10 @@ bool file_list_search(const file_list_t *list, const char *needle, size_t *idx)
for (i = 0; i < list->size; i++) for (i = 0; i < list->size; i++)
{ {
const char *str = NULL; const char *str = NULL;
const char *alt = list->list[i].alt
? list->list[i].alt
: list->list[i].path;
file_list_get_alt_at_offset(list, i, &alt);
if (!alt) if (!alt)
{ {
file_list_get_label_at_offset(list, i, &alt); file_list_get_label_at_offset(list, i, &alt);

5
menu/menu_driver.c
View File

@ -971,7 +971,10 @@ void menu_entries_get_at_offset(const file_list_t *list, size_t idx,
size_t *entry_idx, const char **alt) size_t *entry_idx, const char **alt)
{ {
file_list_get_at_offset(list, idx, path, label, file_type, entry_idx); file_list_get_at_offset(list, idx, path, label, file_type, entry_idx);
file_list_get_alt_at_offset(list, idx, alt); if (list && alt)
*alt = list->list[idx].alt
? list->list[idx].alt
: list->list[idx].path;
} }
/** /**