ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2018-02-05 15:03:54 +01:00
parent bcea63b177
commit 6eee3d68dd
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
list_special.c
View File

@ -55,39 +55,31 @@
struct string_list *dir_list_new_special(const char *input_dir, struct string_list *dir_list_new_special(const char *input_dir,
enum dir_list_type type, const char *filter) enum dir_list_type type, const char *filter)
{ {
char ext_shaders[255];
char ext_name[255];
const char *dir = NULL;
const char *exts = NULL; const char *exts = NULL;
bool include_dirs = false;
bool recursive = false; bool recursive = false;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
ext_shaders[0] = ext_name[0] = '\0';
(void)input_dir;
switch (type) switch (type)
{ {
case DIR_LIST_AUTOCONFIG: case DIR_LIST_AUTOCONFIG:
dir = input_dir;
exts = filter; exts = filter;
break; break;
case DIR_LIST_CORES: case DIR_LIST_CORES:
dir = input_dir; {
char ext_name[255];
ext_name[0] = '\0';
if (!frontend_driver_get_core_extension(ext_name, sizeof(ext_name))) if (!frontend_driver_get_core_extension(ext_name, sizeof(ext_name)))
return NULL; return NULL;
exts = ext_name; exts = ext_name;
}
break; break;
case DIR_LIST_CORE_INFO: case DIR_LIST_CORE_INFO:
{ {
core_info_list_t *list = NULL; core_info_list_t *list = NULL;
core_info_get_list(&list); core_info_get_list(&list);
dir = input_dir;
if (list) if (list)
exts = list->all_ext; exts = list->all_ext;
} }
@ -97,8 +89,6 @@ struct string_list *dir_list_new_special(const char *input_dir,
core_info_list_t *list = NULL; core_info_list_t *list = NULL;
core_info_get_list(&list); core_info_get_list(&list);
dir = input_dir;
if (list) if (list)
exts = list->all_ext; exts = list->all_ext;
recursive = true; recursive = true;
@ -106,6 +96,7 @@ struct string_list *dir_list_new_special(const char *input_dir,
break; break;
case DIR_LIST_SHADERS: case DIR_LIST_SHADERS:
{ {
char ext_shaders[255];
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_VULKAN) #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_VULKAN)
union string_list_elem_attr attr; union string_list_elem_attr attr;
#endif #endif
@ -113,12 +104,13 @@ struct string_list *dir_list_new_special(const char *input_dir,
if (!str_list) if (!str_list)
return NULL; return NULL;
ext_shaders[0] = '\0';
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_VULKAN) #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_VULKAN)
attr.i = 0; attr.i = 0;
#endif #endif
dir = input_dir;
#ifdef HAVE_CG #ifdef HAVE_CG
string_list_append(str_list, "cg", attr); string_list_append(str_list, "cg", attr);
string_list_append(str_list, "cgp", attr); string_list_append(str_list, "cgp", attr);
@ -137,15 +129,12 @@ struct string_list *dir_list_new_special(const char *input_dir,
} }
break; break;
case DIR_LIST_COLLECTIONS: case DIR_LIST_COLLECTIONS:
dir = input_dir;
exts = "lpl"; exts = "lpl";
break; break;
case DIR_LIST_DATABASES: case DIR_LIST_DATABASES:
dir = input_dir;
exts = "rdb"; exts = "rdb";
break; break;
case DIR_LIST_PLAIN: case DIR_LIST_PLAIN:
dir = input_dir;
exts = filter; exts = filter;
break; break;
case DIR_LIST_NONE: case DIR_LIST_NONE:
@ -153,7 +142,7 @@ struct string_list *dir_list_new_special(const char *input_dir,
return NULL; return NULL;
} }
return dir_list_new(dir, exts, include_dirs, settings->bools.show_hidden_files, return dir_list_new(input_dir, exts, false, settings->bools.show_hidden_files,
type == DIR_LIST_CORE_INFO, recursive); type == DIR_LIST_CORE_INFO, recursive);
} }