mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-08-31 10:58:15 +02:00
parent 9ba9098cb0
commit 5a28266abf
1 changed files with 27 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
libretro-common/file/dir_list.c
View File

@ -227,8 +227,8 @@ struct string_list *dir_list_new(const char *dir,
SceUID directory; SceUID directory;
SceIoDirent entry; SceIoDirent entry;
#else #else
DIR *directory = NULL; DIR *directory = NULL;
const struct dirent *entry = NULL; const struct dirent *entry = NULL;
#endif #endif
struct string_list *ext_list = NULL; struct string_list *ext_list = NULL;
struct string_list *list = NULL; struct string_list *list = NULL;
@ -247,86 +247,36 @@ struct string_list *dir_list_new(const char *dir,
goto error; goto error;
while (FindNextFile(hFind, &entry) != 0) while (FindNextFile(hFind, &entry) != 0)
{
char file_path[PATH_MAX_LENGTH];
int ret = 0;
const char *name = entry.cFileName;
const char *file_ext = path_get_extension(name);
bool is_dir = false;
fill_pathname_join(file_path, dir, name, sizeof(file_path));
is_dir = dirent_is_directory(file_path, &entry);
ret = parse_dir_entry(name, file_path, is_dir,
include_dirs, include_compressed, list, ext_list, file_ext);
if (ret == -1)
goto error;
if (ret == 1)
continue;
}
FindClose(hFind);
string_list_free(ext_list);
return list;
error:
if (hFind != INVALID_HANDLE_VALUE)
FindClose(hFind);
#elif defined(VITA) #elif defined(VITA)
directory = sceIoDopen(dir); directory = sceIoDopen(dir);
if (directory < 0) if (directory < 0)
goto error; goto error;
while (sceIoDread(directory, &entry) > 0) while (sceIoDread(directory, &entry) > 0)
{
char file_path[PATH_MAX_LENGTH];
int ret = 0;
const char *name = entry.d_name;
const char *file_ext = path_get_extension(name);
bool is_dir = false;
fill_pathname_join(file_path, dir, name, sizeof(file_path));
is_dir = dirent_is_directory(file_path, entry);
ret = parse_dir_entry(name, file_path, is_dir,
include_dirs, include_compressed, list, ext_list, file_ext);
if (ret == -1)
goto error;
if (ret == 1)
continue;
}
sceIoDclose(directory);
string_list_free(ext_list);
return list;
error:
sceIoDclose(directory);
#else #else
directory = opendir(dir); directory = opendir(dir);
if (!directory) if (!directory)
goto error; goto error;
while ((entry = readdir(directory))) while ((entry = readdir(directory)))
#endif
{ {
char file_path[PATH_MAX_LENGTH]; char file_path[PATH_MAX_LENGTH];
int ret = 0; int ret = 0;
#ifdef _WIN32
const char *name = entry.cFileName;
bool is_dir = dirent_is_directory(file_path, &entry);
#elif defined(VITA)
const char *name = entry.d_name;
bool is_dir = dirent_is_directory(file_path, entry);
#else
const char *name = entry->d_name; const char *name = entry->d_name;
bool is_dir = dirent_is_directory(file_path, entry);
#endif
const char *file_ext = path_get_extension(name); const char *file_ext = path_get_extension(name);
bool is_dir = false;
fill_pathname_join(file_path, dir, name, sizeof(file_path)); fill_pathname_join(file_path, dir, name, sizeof(file_path));
is_dir = dirent_is_directory(file_path, entry);
ret = parse_dir_entry(name, file_path, is_dir, ret = parse_dir_entry(name, file_path, is_dir,
include_dirs, include_compressed, list, ext_list, file_ext); include_dirs, include_compressed, list, ext_list, file_ext);
@ -337,15 +287,29 @@ error:
continue; continue;
} }
closedir(directory); #ifdef _WIN32
FindClose(hFind);
#elif defined(VITA)
sceIoDclose(directory);
#else
if (directory)
closedir(directory);
#endif
string_list_free(ext_list); string_list_free(ext_list);
return list; return list;
error: error:
#if defined(_WIN32)
if (hFind != INVALID_HANDLE_VALUE)
FindClose(hFind);
#elif defined(VITA)
sceIoDclose(directory);
#else
if (directory) if (directory)
closedir(directory); closedir(directory);
#endif #endif
string_list_free(list); string_list_free(list);
string_list_free(ext_list); string_list_free(ext_list);
return NULL; return NULL;