From 3720cf87e7f6e7a909d6edcdc06e4c62bf308ee0 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 20 Mar 2016 16:29:14 +0100
Subject: [PATCH] Rename retro_file to file_stream

---
 Makefile.common                                          | 2 +-
 Makefile.ps3.salamander                                  | 2 +-
 Makefile.psp1.salamander                                 | 2 +-
 Makefile.wii.salamander                                  | 2 +-
 cheevos.c                                                | 2 +-
 content.c                                                | 2 +-
 frontend/drivers/platform_linux.c                        | 2 +-
 gfx/drivers/gx_gfx.c                                     | 2 +-
 gfx/drivers_context/drm_ctx.c                            | 2 +-
 gfx/drivers_context/mali_fbdev_ctx.c                     | 2 +-
 gfx/drivers_font_renderer/stb.c                          | 2 +-
 gfx/drivers_shader/glslang_util.cpp                      | 2 +-
 gfx/drivers_shader/shader_glsl.c                         | 2 +-
 gfx/video_state_python.c                                 | 2 +-
 gfx/video_texture_image.c                                | 2 +-
 griffin/griffin.c                                        | 2 +-
 libretro-common/file/archive_file.c                      | 2 +-
 libretro-common/file/archive_file_zlib.c                 | 2 +-
 libretro-common/formats/bmp/rbmp_encode.c                | 2 +-
 libretro-common/formats/png/rpng_encode.c                | 2 +-
 libretro-common/formats/xml/rxml.c                       | 2 +-
 libretro-common/hash/rhash.c                             | 2 +-
 .../include/{retro_file.h => streams/file_stream.h}      | 8 ++++----
 .../{file/retro_file.c => streams/file_stream.c}         | 6 +++---
 libretro-db/Makefile                                     | 9 ++++++---
 libretro-db/libretrodb.c                                 | 2 +-
 libretro-db/rmsgpack.h                                   | 2 +-
 libretro-db/rmsgpack_dom.h                               | 2 +-
 menu/cbs/menu_cbs_ok.c                                   | 1 -
 menu/menu_content.c                                      | 2 +-
 patch.c                                                  | 2 +-
 retroarch.c                                              | 2 +-
 tasks/task_database_cue.c                                | 2 +-
 tasks/task_http.c                                        | 2 +-
 34 files changed, 43 insertions(+), 41 deletions(-)
 rename libretro-common/include/{retro_file.h => streams/file_stream.h} (91%)
 rename libretro-common/{file/retro_file.c => streams/file_stream.c} (98%)

diff --git a/Makefile.common b/Makefile.common
index d2abb79bc9..aa42f035b7 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -132,7 +132,7 @@ OBJ += frontend/frontend.o \
        libretro-common/lists/file_list.o \
        libretro-common/lists/dir_list.o \
        libretro-common/file/retro_dirent.o \
-       libretro-common/file/retro_file.o \
+       libretro-common/streams/file_stream.o \
        libretro-common/file/retro_stat.o \
        libretro-common/lists/string_list.o \
        libretro-common/string/stdstring.o \
diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander
index 074d5c6167..67c7b99bee 100644
--- a/Makefile.ps3.salamander
+++ b/Makefile.ps3.salamander
@@ -31,7 +31,7 @@ PPU_SRCS		= frontend/frontend_salamander.c \
 				  libretro-common/hash/rhash.c \
 				  libretro-common/string/stdstring.c \
 				  libretro-common/compat/compat_strl.c \
-				  libretro-common/file/retro_file.c \
+				  libretro-common/streams/file_stream.c \
 				  libretro-common/file/config_file.c \
 				  verbosity.c
 
diff --git a/Makefile.psp1.salamander b/Makefile.psp1.salamander
index 05f68a72dd..37c1f3f24d 100644
--- a/Makefile.psp1.salamander
+++ b/Makefile.psp1.salamander
@@ -42,7 +42,7 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/file/retro_dirent.o \
 		 libretro-common/compat/compat_strl.o \
 		 libretro-common/file/config_file.o \
-		 libretro-common/file/retro_file.o \
+		 libretro-common/streams/file_stream.o \
 		 libretro-common/file/retro_stat.o \
 		 libretro-common/hash/rhash.o \
 		 verbosity.o \
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index 49aecf388d..e5c8ba96be 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -49,7 +49,7 @@ OBJ = frontend/frontend_salamander.o \
 		libretro-common/string/stdstring.o \
 		libretro-common/lists/string_list.o \
 		libretro-common/lists/dir_list.o \
-		libretro-common/file/retro_file.o \
+		libretro-common/streams/file_stream.o \
 		libretro-common/file/retro_dirent.o \
 		libretro-common/file/retro_stat.o \
 		libretro-common/compat/compat_strl.o \
diff --git a/cheevos.c b/cheevos.c
index a8e20b0186..82586cdb09 100644
--- a/cheevos.c
+++ b/cheevos.c
@@ -17,7 +17,7 @@
 #include <ctype.h>
 
 #include <formats/jsonsax.h>
-#include <retro_file.h>
+#include <streams/file_stream.h>
 #include <rhash.h>
 #include <rthreads/async_job.h>
 
diff --git a/content.c b/content.c
index f88d1a7a03..38ed9a5961 100644
--- a/content.c
+++ b/content.c
@@ -45,7 +45,7 @@
 #include <string/stdstring.h>
 
 #include <retro_miscellaneous.h>
-#include <retro_file.h>
+#include <streams/file_stream.h>
 #include <retro_stat.h>
 #include <retro_assert.h>
 
diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c
index 79d200cee3..41ba2e7ab3 100644
--- a/frontend/drivers/platform_linux.c
+++ b/frontend/drivers/platform_linux.c
@@ -38,10 +38,10 @@
 #include <boolean.h>
 #include <retro_dirent.h>
 #include <retro_inline.h>
-#include <retro_file.h>
 #include <compat/strl.h>
 #include <rhash.h>
 #include <file/file_path.h>
+#include <streams/file_stream.h>
 #include <string/stdstring.h>
 
 #include "../frontend.h"
diff --git a/gfx/drivers/gx_gfx.c b/gfx/drivers/gx_gfx.c
index 96979892db..6c361d49d9 100644
--- a/gfx/drivers/gx_gfx.c
+++ b/gfx/drivers/gx_gfx.c
@@ -21,7 +21,7 @@
 #include <gccore.h>
 #include <ogcsys.h>
 
-#include <retro_file.h>
+#include <streams/file_stream.h>
 
 #include "../../driver.h"
 #include "../../general.h"
diff --git a/gfx/drivers_context/drm_ctx.c b/gfx/drivers_context/drm_ctx.c
index cd9d831b65..1555b4ac90 100644
--- a/gfx/drivers_context/drm_ctx.c
+++ b/gfx/drivers_context/drm_ctx.c
@@ -33,7 +33,7 @@
 #include <gbm.h>
 
 #include <lists/dir_list.h>
-#include <retro_file.h>
+#include <streams/file_stream.h>
 
 #include "../../verbosity.h"
 #include "../../driver.h"
diff --git a/gfx/drivers_context/mali_fbdev_ctx.c b/gfx/drivers_context/mali_fbdev_ctx.c
index 35082a0e67..725efda511 100644
--- a/gfx/drivers_context/mali_fbdev_ctx.c
+++ b/gfx/drivers_context/mali_fbdev_ctx.c
@@ -21,7 +21,7 @@
 #include <linux/fb.h>
 #include <linux/vt.h>
 
-#include <retro_file.h>
+#include <streams/file_stream.h>
 
 #include "../../driver.h"
 #include "../../general.h"
diff --git a/gfx/drivers_font_renderer/stb.c b/gfx/drivers_font_renderer/stb.c
index 07c4589f53..c24573cbb5 100644
--- a/gfx/drivers_font_renderer/stb.c
+++ b/gfx/drivers_font_renderer/stb.c
@@ -17,7 +17,7 @@
 #include <ctype.h>
 
 #include <file/file_path.h>
-#include <retro_file.h>
+#include <streams/file_stream.h>
 
 #include "../font_driver.h"
 #include "../../general.h"
diff --git a/gfx/drivers_shader/glslang_util.cpp b/gfx/drivers_shader/glslang_util.cpp
index 57b8c788d8..5a1103cdee 100644
--- a/gfx/drivers_shader/glslang_util.cpp
+++ b/gfx/drivers_shader/glslang_util.cpp
@@ -17,7 +17,7 @@
 #include <string>
 #include <sstream>
 
-#include <retro_file.h>
+#include <streams/file_stream.h>
 #include <lists/string_list.h>
 
 #include "glslang_util.hpp"
diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index 91a7d90d3d..68416dc220 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -20,7 +20,7 @@
 #include <compat/posix_string.h>
 #include <file/file_path.h>
 #include <retro_assert.h>
-#include <retro_file.h>
+#include <streams/file_stream.h>
 #include <string/stdstring.h>
 
 #include "../../general.h"
diff --git a/gfx/video_state_python.c b/gfx/video_state_python.c
index 11a0d4f81c..069cf76ca9 100644
--- a/gfx/video_state_python.c
+++ b/gfx/video_state_python.c
@@ -21,7 +21,7 @@
 
 #include <compat/strl.h>
 #include <compat/posix_string.h>
-#include <retro_file.h>
+#include <streams/file_stream.h>
 
 #include "video_state_python.h"
 #include "../dynamic.h"
diff --git a/gfx/video_texture_image.c b/gfx/video_texture_image.c
index 001380f7d6..903cdd1ba1 100644
--- a/gfx/video_texture_image.c
+++ b/gfx/video_texture_image.c
@@ -29,7 +29,7 @@
 #include <formats/rpng.h>
 #endif
 #include <formats/tga.h>
-#include <retro_file.h>
+#include <streams/file_stream.h>
 
 #include "../general.h"
 
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 034a65fc13..203aa40b0e 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -642,7 +642,7 @@ FILE
 #include "../libretro-common/lists/string_list.c"
 #include "../libretro-common/lists/file_list.c"
 #include "../libretro-common/file/retro_dirent.c"
-#include "../libretro-common/file/retro_file.c"
+#include "../libretro-common/streams/file_stream.c"
 #include "../libretro-common/file/retro_stat.c"
 #include "../dir_list_special.c"
 #include "../string_list_special.c"
diff --git a/libretro-common/file/archive_file.c b/libretro-common/file/archive_file.c
index e975cbc775..e31d9ef2d0 100644
--- a/libretro-common/file/archive_file.c
+++ b/libretro-common/file/archive_file.c
@@ -41,7 +41,7 @@
 #include <compat/strl.h>
 #include <file/archive_file.h>
 #include <file/file_path.h>
-#include <retro_file.h>
+#include <streams/file_stream.h>
 #include <retro_stat.h>
 #include <retro_miscellaneous.h>
 #include <lists/string_list.h>
diff --git a/libretro-common/file/archive_file_zlib.c b/libretro-common/file/archive_file_zlib.c
index b08e5ae04c..42f3ba92c4 100644
--- a/libretro-common/file/archive_file_zlib.c
+++ b/libretro-common/file/archive_file_zlib.c
@@ -24,7 +24,7 @@
 
 #include <compat/zlib.h>
 #include <file/archive_file.h>
-#include <retro_file.h>
+#include <streams/file_stream.h>
 
 static void *zlib_stream_new(void)
 {
diff --git a/libretro-common/formats/bmp/rbmp_encode.c b/libretro-common/formats/bmp/rbmp_encode.c
index b094d82646..d6163f0470 100644
--- a/libretro-common/formats/bmp/rbmp_encode.c
+++ b/libretro-common/formats/bmp/rbmp_encode.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <retro_file.h>
+#include <streams/file_stream.h>
 #include <formats/rbmp.h>
 
 static bool write_header_bmp(RFILE *file, unsigned width, unsigned height, bool is32bpp)
diff --git a/libretro-common/formats/png/rpng_encode.c b/libretro-common/formats/png/rpng_encode.c
index 8532e05fd0..9f5253eff7 100644
--- a/libretro-common/formats/png/rpng_encode.c
+++ b/libretro-common/formats/png/rpng_encode.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <retro_file.h>
+#include <streams/file_stream.h>
 
 #include "rpng_internal.h"
 
diff --git a/libretro-common/formats/xml/rxml.c b/libretro-common/formats/xml/rxml.c
index 73f03b6ae0..d63bc89f58 100644
--- a/libretro-common/formats/xml/rxml.c
+++ b/libretro-common/formats/xml/rxml.c
@@ -29,7 +29,7 @@
 #include <ctype.h>
 
 #include <boolean.h>
-#include <retro_file.h>
+#include <streams/file_stream.h>
 #include <compat/posix_string.h>
 
 #include <formats/rxml.h>
diff --git a/libretro-common/hash/rhash.c b/libretro-common/hash/rhash.c
index edf6a06e57..6e11e6ebbc 100644
--- a/libretro-common/hash/rhash.c
+++ b/libretro-common/hash/rhash.c
@@ -30,7 +30,7 @@
 #include <rhash.h>
 #include <retro_miscellaneous.h>
 #include <retro_endianness.h>
-#include <retro_file.h>
+#include <streams/file_stream.h>
 
 #define LSL32(x, n) ((uint32_t)(x) << (n))
 #define LSR32(x, n) ((uint32_t)(x) >> (n))
diff --git a/libretro-common/include/retro_file.h b/libretro-common/include/streams/file_stream.h
similarity index 91%
rename from libretro-common/include/retro_file.h
rename to libretro-common/include/streams/file_stream.h
index 4af93ac433..de7a90fd7f 100644
--- a/libretro-common/include/retro_file.h
+++ b/libretro-common/include/streams/file_stream.h
@@ -1,7 +1,7 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2016 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (retro_file.h).
+ * The following license statement only applies to this file (file_stream.h).
  * ---------------------------------------------------------------------------------------
  *
  * Permission is hereby granted, free of charge,
@@ -20,8 +20,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __RETRO_FILE_H
-#define __RETRO_FILE_H
+#ifndef __LIBRETRO_SDK_FILE_STREAM_H
+#define __LIBRETRO_SDK_FILE_STREAM_H
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/libretro-common/file/retro_file.c b/libretro-common/streams/file_stream.c
similarity index 98%
rename from libretro-common/file/retro_file.c
rename to libretro-common/streams/file_stream.c
index d4325b3f6e..41a6810f23 100644
--- a/libretro-common/file/retro_file.c
+++ b/libretro-common/streams/file_stream.c
@@ -1,7 +1,7 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2016 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (retro_file.c).
+ * The following license statement only applies to this file (file_stream.c).
  * ---------------------------------------------------------------------------------------
  *
  * Permission is hereby granted, free of charge,
@@ -63,7 +63,7 @@
 #include <fcntl.h>
 #endif
 
-#include <retro_file.h>
+#include <streams/file_stream.h>
 #include <memmap.h>
 
 #if 1
diff --git a/libretro-db/Makefile b/libretro-db/Makefile
index 439bf6aa47..eedca1dc54 100644
--- a/libretro-db/Makefile
+++ b/libretro-db/Makefile
@@ -10,6 +10,9 @@ else
 CFLAGS               = -g -O2 -Wall -DNDEBUG
 endif
 
+LIBRETRO_COMMON_C = \
+			 $(LIBRETRO_COMMON_DIR)/streams/file_stream.c
+
 C_CONVERTER_C = \
 			 rmsgpack.c \
 			 rmsgpack_dom.c \
@@ -19,7 +22,7 @@ C_CONVERTER_C = \
 			 c_converter.c \
 			 $(LIBRETRO_COMMON_DIR)/hash/rhash.c \
 			 $(LIBRETRO_COMMON_DIR)/compat/compat_fnmatch.c \
-			 $(LIBRETRO_COMMON_DIR)/file/retro_file.c \
+			 $(LIBRETRO_COMMON_C) \
 			 $(LIBRETRO_COMMON_DIR)/compat/compat_strl.c
 
 C_CONVERTER_OBJS := $(C_CONVERTER_C:.c=.o)
@@ -32,7 +35,7 @@ RARCHDB_TOOL_C = \
 			 query.c \
 			 libretrodb.c \
 			 $(LIBRETRO_COMMON_DIR)/compat/compat_fnmatch.c \
-			 $(LIBRETRO_COMMON_DIR)/file/retro_file.c \
+			 $(LIBRETRO_COMMON_C) \
 			 $(LIBRETRO_COMMON_DIR)/compat/compat_strl.c
 
 RARCHDB_TOOL_OBJS := $(RARCHDB_TOOL_C:.c=.o)
@@ -40,7 +43,7 @@ RARCHDB_TOOL_OBJS := $(RARCHDB_TOOL_C:.c=.o)
 RMSGPACK_C = \
 			rmsgpack.c \
 			rmsgpack_test.c \
-			$(LIBRETRO_COMMON_DIR)/file/retro_file.c
+			 $(LIBRETRO_COMMON_C)
 
 RMSGPACK_OBJS := $(RMSGPACK_C:.c=.o)
 
diff --git a/libretro-db/libretrodb.c b/libretro-db/libretrodb.c
index addb61a6a2..554242efd5 100644
--- a/libretro-db/libretrodb.c
+++ b/libretro-db/libretrodb.c
@@ -11,7 +11,7 @@
 #include <sys/stat.h>
 #include <stdlib.h>
 
-#include <retro_file.h>
+#include <streams/file_stream.h>
 #include <retro_endianness.h>
 #include <compat/strl.h>
 
diff --git a/libretro-db/rmsgpack.h b/libretro-db/rmsgpack.h
index c802501b82..263f061842 100644
--- a/libretro-db/rmsgpack.h
+++ b/libretro-db/rmsgpack.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include <retro_file.h>
+#include <streams/file_stream.h>
 
 struct rmsgpack_read_callbacks
 {
diff --git a/libretro-db/rmsgpack_dom.h b/libretro-db/rmsgpack_dom.h
index 1773d2e3ef..fc595d99d1 100644
--- a/libretro-db/rmsgpack_dom.h
+++ b/libretro-db/rmsgpack_dom.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include <retro_file.h>
+#include <streams/file_stream.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 335622b385..b2329da8e6 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -16,7 +16,6 @@
 #include <file/file_path.h>
 #include <retro_assert.h>
 #include <retro_stat.h>
-#include <retro_file.h>
 #include <string/stdstring.h>
 #include <lists/string_list.h>
 
diff --git a/menu/menu_content.c b/menu/menu_content.c
index f92c3c330f..bc0a3ef95e 100644
--- a/menu/menu_content.c
+++ b/menu/menu_content.c
@@ -14,7 +14,7 @@
  */
 
 #include <retro_assert.h>
-#include <retro_file.h>
+#include <streams/file_stream.h>
 #include <file/file_path.h>
 #include <string/stdstring.h>
 
diff --git a/patch.c b/patch.c
index 3df3808753..35a598e435 100644
--- a/patch.c
+++ b/patch.c
@@ -25,7 +25,7 @@
 #include <compat/msvc.h>
 #include <file/file_path.h>
 #include <file/archive_file.h>
-#include <retro_file.h>
+#include <streams/file_stream.h>
 #include <retro_stat.h>
 #include <string/stdstring.h>
 
diff --git a/retroarch.c b/retroarch.c
index fbe6eb6e18..c6e1563c8d 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -25,6 +25,7 @@
 
 #include <boolean.h>
 #include <string/stdstring.h>
+#include <streams/file_stream.h>
 #include <lists/string_list.h>
 
 #ifdef _WIN32
@@ -59,7 +60,6 @@
 #include "performance.h"
 #include "cheats.h"
 #include "system.h"
-#include "retro_file.h"
 
 #include "git_version.h"
 
diff --git a/tasks/task_database_cue.c b/tasks/task_database_cue.c
index 8ce28d589a..9a71495d23 100644
--- a/tasks/task_database_cue.c
+++ b/tasks/task_database_cue.c
@@ -21,7 +21,7 @@
 #include <compat/strl.h>
 #include <file/file_path.h>
 #include <retro_endianness.h>
-#include <retro_file.h>
+#include <streams/file_stream.h>
 #include <string/stdstring.h>
 
 #include "tasks_internal.h"
diff --git a/tasks/task_http.c b/tasks/task_http.c
index b75c6a64cb..260063a75f 100644
--- a/tasks/task_http.c
+++ b/tasks/task_http.c
@@ -22,7 +22,7 @@
 #include <file/file_path.h>
 #include <file/archive_file.h>
 #include <net/net_compat.h>
-#include <retro_file.h>
+#include <streams/file_stream.h>
 #include <retro_stat.h>
 
 #include "../msg_hash.h"