mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 16:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(dir_list.c) Cleanups/style nits

Browse Source
This commit is contained in:
twinaphex 2016-12-17 11:15:04 +01:00
parent a5222c4ce0
commit 4409c89d43
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libretro-common/lists/dir_list.c
View File

@ -167,7 +167,9 @@ static int parse_dir_entry(const char *name, char *file_path,
* NULL in case of error. Has to be freed manually. * NULL in case of error. Has to be freed manually.
**/ **/
struct string_list *dir_list_new(const char *dir, struct string_list *dir_list_new(const char *dir,
const char *ext, bool include_dirs, bool include_hidden, bool include_compressed, bool recursive) const char *ext, bool include_dirs,
bool include_hidden, bool include_compressed,
bool recursive)
{ {
struct string_list *ext_list = NULL; struct string_list *ext_list = NULL;
struct string_list *list = NULL; struct string_list *list = NULL;
@ -178,7 +180,9 @@ struct string_list *dir_list_new(const char *dir,
if (ext) if (ext)
ext_list = string_split(ext, "|"); ext_list = string_split(ext, "|");
if(dir_list_read(dir, list, ext_list, include_dirs, include_hidden, include_compressed, recursive) == -1) { if(dir_list_read(dir, list, ext_list, include_dirs,
include_hidden, include_compressed, recursive) == -1)
{
string_list_free(list); string_list_free(list);
string_list_free(ext_list); string_list_free(ext_list);
return NULL; return NULL;
@ -202,7 +206,10 @@ struct string_list *dir_list_new(const char *dir,
* *
* Returns: -1 on error, 0 on success. * Returns: -1 on error, 0 on success.
**/ **/
int dir_list_read(const char *dir, struct string_list *list, struct string_list *ext_list, bool include_dirs, bool include_hidden, bool include_compressed, bool recursive) int dir_list_read(const char *dir,
struct string_list *list, struct string_list *ext_list,
bool include_dirs, bool include_hidden,
bool include_compressed, bool recursive)
{ {
struct RDIR *entry = retro_opendir(dir); struct RDIR *entry = retro_opendir(dir);
@ -241,11 +248,13 @@ int dir_list_read(const char *dir, struct string_list *list, struct string_list
continue; continue;
} }
if(is_dir && recursive) { if(is_dir && recursive)
{
if(strstr(name, ".") || strstr(name, "..")) if(strstr(name, ".") || strstr(name, ".."))
continue; continue;
dir_list_read(file_path, list, ext_list, include_dirs, include_hidden, include_compressed, recursive); dir_list_read(file_path, list, ext_list, include_dirs,
include_hidden, include_compressed, recursive);
} }
ret = parse_dir_entry(name, file_path, is_dir, ret = parse_dir_entry(name, file_path, is_dir,