mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

(file_list.c) Get rid of 'alt2'

Browse Source
This commit is contained in:
twinaphex 2015-06-07 00:53:00 +02:00
parent f7541125d2
commit d3102e03c8
4 changed files with 0 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libretro-common/file/file_list.c
View File

@ -45,7 +45,6 @@ void file_list_push(file_list_t *list,
list->list[list->size].label = NULL; list->list[list->size].label = NULL;
list->list[list->size].path = NULL; list->list[list->size].path = NULL;
list->list[list->size].alt = NULL; list->list[list->size].alt = NULL;
list->list[list->size].alt2 = NULL;
list->list[list->size].type = type; list->list[list->size].type = type;
list->list[list->size].directory_ptr = directory_ptr; list->list[list->size].directory_ptr = directory_ptr;
@ -112,10 +111,6 @@ void file_list_free(file_list_t *list)
if (list->list[i].alt) if (list->list[i].alt)
free(list->list[i].alt); free(list->list[i].alt);
list->list[i].alt = NULL; list->list[i].alt = NULL;
if (list->list[i].alt2)
free(list->list[i].alt2);
list->list[i].alt2 = NULL;
} }
if (list->list) if (list->list)
free(list->list); free(list->list);
@ -144,10 +139,6 @@ void file_list_clear(file_list_t *list)
if (list->list[i].alt) if (list->list[i].alt)
free(list->list[i].alt); free(list->list[i].alt);
list->list[i].alt = NULL; list->list[i].alt = NULL;
if (list->list[i].alt2)
free(list->list[i].alt2);
list->list[i].alt2 = NULL;
} }
list->size = 0; list->size = 0;
@ -174,7 +165,6 @@ void file_list_copy(file_list_t *list, file_list_t *list_old)
list_old->list[i].path = NULL; list_old->list[i].path = NULL;
list_old->list[i].label = NULL; list_old->list[i].label = NULL;
list_old->list[i].alt = NULL; list_old->list[i].alt = NULL;
list_old->list[i].alt2 = NULL;
list_old->list[i].type = list->list[i].type; list_old->list[i].type = list->list[i].type;
list_old->list[i].directory_ptr = list->list[i].directory_ptr; list_old->list[i].directory_ptr = list->list[i].directory_ptr;
list_old->list[i].userdata = list->list[i].userdata; list_old->list[i].userdata = list->list[i].userdata;
@ -186,8 +176,6 @@ void file_list_copy(file_list_t *list, file_list_t *list_old)
list_old->list[i].label = strdup(list->list[i].label); list_old->list[i].label = strdup(list->list[i].label);
if (list->list[i].alt) if (list->list[i].alt)
list_old->list[i].alt = strdup(list->list[i].alt); list_old->list[i].alt = strdup(list->list[i].alt);
if (list->list[i].alt2)
list_old->list[i].alt2 = strdup(list->list[i].alt2);
} }
} }
@ -200,7 +188,6 @@ void file_list_set_label_at_offset(file_list_t *list, size_t idx,
if (list->list[idx].label) if (list->list[idx].label)
free(list->list[idx].label); free(list->list[idx].label);
list->list[idx].alt = NULL; list->list[idx].alt = NULL;
list->list[idx].alt2 = NULL;
if (label) if (label)
list->list[idx].label = strdup(label); list->list[idx].label = strdup(label);
@ -231,31 +218,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_set_alt2_at_offset(file_list_t *list, size_t idx,
const char *alt)
{
if (!list)
return;
if (list->list[idx].alt2)
free(list->list[idx].alt2);
list->list[idx].alt2 = NULL;
if (alt)
list->list[idx].alt2 = strdup(alt);
}
void file_list_get_alt2_at_offset(const file_list_t *list, size_t idx,
const char **alt)
{
if (!list)
return;
if (alt)
*alt = list->list[idx].alt2 ?
list->list[idx].alt2 : list->list[idx].path;
}
void file_list_get_alt_at_offset(const file_list_t *list, size_t idx, void file_list_get_alt_at_offset(const file_list_t *list, size_t idx,
const char **alt) const char **alt)
{ {

7
libretro-common/include/file/file_list.h
View File

@ -34,7 +34,6 @@ struct item_file
char *path; char *path;
char *label; char *label;
char *alt; char *alt;
char *alt2;
unsigned type; unsigned type;
size_t directory_ptr; size_t directory_ptr;
void *userdata; void *userdata;
@ -87,15 +86,9 @@ void file_list_set_label_at_offset(file_list_t *list, size_t index,
void file_list_get_label_at_offset(const file_list_t *list, size_t index, void file_list_get_label_at_offset(const file_list_t *list, size_t index,
const char **label); const char **label);
void file_list_set_alt2_at_offset(file_list_t *list, size_t index,
const char *alt);
void file_list_set_alt_at_offset(file_list_t *list, size_t index, void file_list_set_alt_at_offset(file_list_t *list, size_t index,
const char *alt); const char *alt);
void file_list_get_alt2_at_offset(const file_list_t *list, size_t index,
const char **alt);
void file_list_get_alt_at_offset(const file_list_t *list, size_t index, void file_list_get_alt_at_offset(const file_list_t *list, size_t index,
const char **alt); const char **alt);

12
menu/menu_list.c
View File

@ -353,18 +353,6 @@ void menu_list_set_alt_at_offset(file_list_t *list, size_t idx,
file_list_set_alt_at_offset(list, idx, alt); file_list_set_alt_at_offset(list, idx, alt);
} }
void menu_list_set_alt2_at_offset(file_list_t *list, size_t idx,
const char *alt)
{
file_list_set_alt2_at_offset(list, idx, alt);
}
void menu_list_get_alt2_at_offset(const file_list_t *list, size_t idx,
const char **alt)
{
file_list_get_alt2_at_offset(list, idx, alt);
}
void menu_list_get_alt_at_offset(const file_list_t *list, size_t idx, void menu_list_get_alt_at_offset(const file_list_t *list, size_t idx,
const char **alt) const char **alt)
{ {

6
menu/menu_list.h
View File

@ -107,15 +107,9 @@ void menu_list_push(file_list_t *list,
void menu_list_get_alt_at_offset(const file_list_t *list, size_t idx, void menu_list_get_alt_at_offset(const file_list_t *list, size_t idx,
const char **alt); const char **alt);
void menu_list_get_alt2_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, void menu_list_set_alt_at_offset(file_list_t *list, size_t idx,
const char *alt); const char *alt);
void menu_list_set_alt2_at_offset(file_list_t *list, size_t idx,
const char *alt);
void menu_list_refresh(file_list_t *list); void menu_list_refresh(file_list_t *list);
#ifdef __cplusplus #ifdef __cplusplus