From 5c2d271f9f6bdb2ebf0528cb5a611634efe11b86 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 16 Jan 2019 03:53:23 +0100
Subject: [PATCH] Revert "Cleanups"

This reverts commit 73e78f51350a465901a5f9e3ef760f0c36340486.
---
 libretro-common/file/file_path.c    |  6 ++++--
 libretro-common/file/retro_dirent.c | 12 ++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c
index 8d9eb8a73c..07b19e67fe 100644
--- a/libretro-common/file/file_path.c
+++ b/libretro-common/file/file_path.c
@@ -142,14 +142,16 @@ static int path_stat(const char *path, int32_t *size)
 {
    if (path_stat_cb != NULL)
       return path_stat_cb(path, NULL);
-   return retro_vfs_stat_impl(path, NULL);
+   else
+      return retro_vfs_stat_impl(path, NULL);
 }
 
 static int path_mkdir_norecurse(const char *dir)
 {
    if (path_mkdir_cb != NULL)
       return path_mkdir_cb(dir);
-   return retro_vfs_mkdir_impl(dir);
+   else
+      return retro_vfs_mkdir_impl(dir);
 }
 
 /**
diff --git a/libretro-common/file/retro_dirent.c b/libretro-common/file/retro_dirent.c
index 752cbdad01..353a12e81b 100644
--- a/libretro-common/file/retro_dirent.c
+++ b/libretro-common/file/retro_dirent.c
@@ -63,7 +63,8 @@ struct RDIR *retro_opendir_include_hidden(const char *name, bool include_hidden)
 {
    if (dirent_opendir_cb != NULL)
       return (struct RDIR *)dirent_opendir_cb(name, include_hidden);
-   return (struct RDIR *)retro_vfs_opendir_impl(name, include_hidden);
+   else
+      return (struct RDIR *)retro_vfs_opendir_impl(name, include_hidden);
 }
 
 struct RDIR *retro_opendir(const char *name)
@@ -81,14 +82,16 @@ int retro_readdir(struct RDIR *rdir)
 {
    if (dirent_readdir_cb != NULL)
       return dirent_readdir_cb((struct retro_vfs_dir_handle *)rdir);
-   return retro_vfs_readdir_impl((struct retro_vfs_dir_handle *)rdir);
+   else
+      return retro_vfs_readdir_impl((struct retro_vfs_dir_handle *)rdir);
 }
 
 const char *retro_dirent_get_name(struct RDIR *rdir)
 {
    if (dirent_dirent_get_name_cb != NULL)
       return dirent_dirent_get_name_cb((struct retro_vfs_dir_handle *)rdir);
-   return retro_vfs_dirent_get_name_impl((struct retro_vfs_dir_handle *)rdir);
+   else
+      return retro_vfs_dirent_get_name_impl((struct retro_vfs_dir_handle *)rdir);
 }
 
 /**
@@ -106,7 +109,8 @@ bool retro_dirent_is_dir(struct RDIR *rdir, const char *unused)
 {
    if (dirent_dirent_is_dir_cb != NULL)
       return dirent_dirent_is_dir_cb((struct retro_vfs_dir_handle *)rdir);
-   return retro_vfs_dirent_is_dir_impl((struct retro_vfs_dir_handle *)rdir);
+   else
+      return retro_vfs_dirent_is_dir_impl((struct retro_vfs_dir_handle *)rdir);
 }
 
 void retro_closedir(struct RDIR *rdir)