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

Revert "Revert "Cleanups"" 

This reverts commit 5c2d271f9f.
This commit is contained in:
krzys-h 2019-01-16 21:01:37 +01:00
parent e6fc4220fa
commit 5a97738f3e
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libretro-common/file/file_path.c
View File

@ -142,16 +142,14 @@ static int path_stat(const char *path, int32_t *size)
{ {
if (path_stat_cb != NULL) if (path_stat_cb != NULL)
return path_stat_cb(path, NULL); return path_stat_cb(path, NULL);
else return retro_vfs_stat_impl(path, NULL);
return retro_vfs_stat_impl(path, NULL);
} }
static int path_mkdir_norecurse(const char *dir) static int path_mkdir_norecurse(const char *dir)
{ {
if (path_mkdir_cb != NULL) if (path_mkdir_cb != NULL)
return path_mkdir_cb(dir); return path_mkdir_cb(dir);
else return retro_vfs_mkdir_impl(dir);
return retro_vfs_mkdir_impl(dir);
} }
/** /**

12
libretro-common/file/retro_dirent.c
View File

@ -63,8 +63,7 @@ struct RDIR *retro_opendir_include_hidden(const char *name, bool include_hidden)
{ {
if (dirent_opendir_cb != NULL) if (dirent_opendir_cb != NULL)
return (struct RDIR *)dirent_opendir_cb(name, include_hidden); return (struct RDIR *)dirent_opendir_cb(name, include_hidden);
else return (struct RDIR *)retro_vfs_opendir_impl(name, include_hidden);
return (struct RDIR *)retro_vfs_opendir_impl(name, include_hidden);
} }
struct RDIR *retro_opendir(const char *name) struct RDIR *retro_opendir(const char *name)
@ -82,16 +81,14 @@ int retro_readdir(struct RDIR *rdir)
{ {
if (dirent_readdir_cb != NULL) if (dirent_readdir_cb != NULL)
return dirent_readdir_cb((struct retro_vfs_dir_handle *)rdir); return dirent_readdir_cb((struct retro_vfs_dir_handle *)rdir);
else return retro_vfs_readdir_impl((struct retro_vfs_dir_handle *)rdir);
return retro_vfs_readdir_impl((struct retro_vfs_dir_handle *)rdir);
} }
const char *retro_dirent_get_name(struct RDIR *rdir) const char *retro_dirent_get_name(struct RDIR *rdir)
{ {
if (dirent_dirent_get_name_cb != NULL) if (dirent_dirent_get_name_cb != NULL)
return dirent_dirent_get_name_cb((struct retro_vfs_dir_handle *)rdir); return dirent_dirent_get_name_cb((struct retro_vfs_dir_handle *)rdir);
else return retro_vfs_dirent_get_name_impl((struct retro_vfs_dir_handle *)rdir);
return retro_vfs_dirent_get_name_impl((struct retro_vfs_dir_handle *)rdir);
} }
/** /**
@ -109,8 +106,7 @@ bool retro_dirent_is_dir(struct RDIR *rdir, const char *unused)
{ {
if (dirent_dirent_is_dir_cb != NULL) if (dirent_dirent_is_dir_cb != NULL)
return dirent_dirent_is_dir_cb((struct retro_vfs_dir_handle *)rdir); return dirent_dirent_is_dir_cb((struct retro_vfs_dir_handle *)rdir);
else return retro_vfs_dirent_is_dir_impl((struct retro_vfs_dir_handle *)rdir);
return retro_vfs_dirent_is_dir_impl((struct retro_vfs_dir_handle *)rdir);
} }
void retro_closedir(struct RDIR *rdir) void retro_closedir(struct RDIR *rdir)