From 552e78c9bcd09587a50212e024e500e97dd8d262 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 24 Jan 2016 07:29:11 +0100
Subject: [PATCH] Rename file_extract to file_archive

---
 Makefile.common                                             | 4 ++--
 content.c                                                   | 2 +-
 core_info.c                                                 | 2 +-
 database_info.c                                             | 1 -
 database_info.h                                             | 2 +-
 file_ops.c                                                  | 2 +-
 libretro-common/file/{file_extract.c => file_archive.c}     | 6 +++---
 .../file/{file_extract_zlib.c => file_archive_zlib.c}       | 4 ++--
 libretro-common/formats/png/rpng.c                          | 2 +-
 .../include/file/{file_extract.h => file_archive.h}         | 6 +++---
 libretro-common/include/formats/rpng.h                      | 2 +-
 menu/menu_displaylist.c                                     | 2 +-
 patch.c                                                     | 2 +-
 tasks/task_decompress.c                                     | 2 +-
 tasks/task_http.c                                           | 2 +-
 15 files changed, 20 insertions(+), 21 deletions(-)
 rename libretro-common/file/{file_extract.c => file_archive.c} (99%)
 rename libretro-common/file/{file_extract_zlib.c => file_archive_zlib.c} (98%)
 rename libretro-common/include/file/{file_extract.h => file_archive.h} (98%)

diff --git a/Makefile.common b/Makefile.common
index 439188021b..3df1ba84f6 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -795,8 +795,8 @@ endif
 
 
 ifeq ($(HAVE_ZLIB), 1)
-   OBJ += libretro-common/file/file_extract.o \
-			 libretro-common/file/file_extract_zlib.o \
+   OBJ += libretro-common/file/file_archive.o \
+			 libretro-common/file/file_archive_zlib.o \
           tasks/task_decompress.o
    OBJ += $(ZLIB_OBJS)
    DEFINES += -DHAVE_ZLIB
diff --git a/content.c b/content.c
index d8e1fa629f..3247a2f128 100644
--- a/content.c
+++ b/content.c
@@ -32,7 +32,7 @@
 
 #include <compat/strl.h>
 #include <file/file_path.h>
-#include <file/file_extract.h>
+#include <file/file_archive.h>
 #include <string/stdstring.h>
 #include <retro_file.h>
 #include <retro_stat.h>
diff --git a/core_info.c b/core_info.c
index 3f132f72f1..5cba8157f3 100644
--- a/core_info.c
+++ b/core_info.c
@@ -16,7 +16,7 @@
  */
 
 #include <file/file_path.h>
-#include <file/file_extract.h>
+#include <file/file_archive.h>
 
 #include <string/stdstring.h>
 
diff --git a/database_info.c b/database_info.c
index 792bbac32e..16f5486577 100644
--- a/database_info.c
+++ b/database_info.c
@@ -17,7 +17,6 @@
 
 #include <stdint.h>
 
-#include <file/file_extract.h>
 #include <retro_endianness.h>
 
 #include "dir_list_special.h"
diff --git a/database_info.h b/database_info.h
index 51264ea0a4..0b1ebfaf91 100644
--- a/database_info.h
+++ b/database_info.h
@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <boolean.h>
-#include <file/file_extract.h>
+#include <file/file_archive.h>
 #include "libretro-db/libretrodb.h"
 #include "playlist.h"
 
diff --git a/file_ops.c b/file_ops.c
index 1694307f01..b6cad09cc0 100644
--- a/file_ops.c
+++ b/file_ops.c
@@ -35,7 +35,7 @@
 #include <string/string_list.h>
 #include <string/stdstring.h>
 #ifdef HAVE_COMPRESSION
-#include <file/file_extract.h>
+#include <file/file_archive.h>
 #endif
 #include <encodings/utf.h>
 
diff --git a/libretro-common/file/file_extract.c b/libretro-common/file/file_archive.c
similarity index 99%
rename from libretro-common/file/file_extract.c
rename to libretro-common/file/file_archive.c
index 797b392c41..ba42fbedfb 100644
--- a/libretro-common/file/file_extract.c
+++ b/libretro-common/file/file_archive.c
@@ -1,7 +1,7 @@
 /* Copyright  (C) 2010-2015 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (file_extract.c).
+ * The following license statement only applies to this file (file_archive.c).
  * ---------------------------------------------------------------------------------------
  *
  * Permission is hereby granted, free of charge,
@@ -28,7 +28,7 @@
 
 #include <compat/strl.h>
 
-#include <file/file_extract.h>
+#include <file/file_archive.h>
 #include <file/file_path.h>
 #include <retro_file.h>
 #include <retro_stat.h>
@@ -440,7 +440,7 @@ bool zlib_parse_file(const char *file, const char *valid_exts,
       zlib_file_cb file_cb, void *userdata)
 {
    zlib_transfer_t state = {0};
-   bool returnerr = true;
+   bool returnerr        = true;
 
    state.type = ZLIB_TRANSFER_INIT;
 
diff --git a/libretro-common/file/file_extract_zlib.c b/libretro-common/file/file_archive_zlib.c
similarity index 98%
rename from libretro-common/file/file_extract_zlib.c
rename to libretro-common/file/file_archive_zlib.c
index eb6f32a920..3543a59dbf 100644
--- a/libretro-common/file/file_extract_zlib.c
+++ b/libretro-common/file/file_archive_zlib.c
@@ -1,7 +1,7 @@
 /* Copyright  (C) 2010-2015 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (file_extract_zlib.c).
+ * The following license statement only applies to this file (file_archive_zlib.c).
  * ---------------------------------------------------------------------------------------
  *
  * Permission is hereby granted, free of charge,
@@ -32,7 +32,7 @@
 #endif
 
 #include <compat/zlib.h>
-#include <file/file_extract.h>
+#include <file/file_archive.h>
 #include <retro_file.h>
 
 #ifdef HAVE_MMAP
diff --git a/libretro-common/formats/png/rpng.c b/libretro-common/formats/png/rpng.c
index d551f28dd1..3e05f48763 100644
--- a/libretro-common/formats/png/rpng.c
+++ b/libretro-common/formats/png/rpng.c
@@ -32,7 +32,7 @@
 #include <boolean.h>
 #include <file/nbio.h>
 #include <formats/rpng.h>
-#include <file/file_extract.h>
+#include <file/file_archive.h>
 
 #include "rpng_internal.h"
 
diff --git a/libretro-common/include/file/file_extract.h b/libretro-common/include/file/file_archive.h
similarity index 98%
rename from libretro-common/include/file/file_extract.h
rename to libretro-common/include/file/file_archive.h
index 99d9a148f4..3a719cd013 100644
--- a/libretro-common/include/file/file_extract.h
+++ b/libretro-common/include/file/file_archive.h
@@ -1,7 +1,7 @@
 /* Copyright  (C) 2010-2015 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (file_extract.h).
+ * The following license statement only applies to this file (file_archive.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 FILE_EXTRACT_H__
-#define FILE_EXTRACT_H__
+#ifndef FILE_ARCHIVE_H__
+#define FILE_ARCHIVE_H__
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/libretro-common/include/formats/rpng.h b/libretro-common/include/formats/rpng.h
index b61315bed3..ee44b76874 100644
--- a/libretro-common/include/formats/rpng.h
+++ b/libretro-common/include/formats/rpng.h
@@ -27,7 +27,7 @@
 #include <stddef.h>
 
 #include <boolean.h>
-#include <file/file_extract.h>
+#include <file/file_archive.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 602cc658df..4872379043 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -17,7 +17,7 @@
 
 #include <file/file_list.h>
 #include <file/file_path.h>
-#include <file/file_extract.h>
+#include <file/file_archive.h>
 #include <file/dir_list.h>
 #include <retro_stat.h>
 #include <string/stdstring.h>
diff --git a/patch.c b/patch.c
index c85fe6885d..022fe6a304 100644
--- a/patch.c
+++ b/patch.c
@@ -24,7 +24,7 @@
 
 #include <compat/msvc.h>
 #include <file/file_path.h>
-#include <file/file_extract.h>
+#include <file/file_archive.h>
 #include <string/stdstring.h>
 
 #include "patch.h"
diff --git a/tasks/task_decompress.c b/tasks/task_decompress.c
index 125c0a48be..49048ff8cc 100644
--- a/tasks/task_decompress.c
+++ b/tasks/task_decompress.c
@@ -20,7 +20,7 @@
 #include <string/string_list.h>
 #include <string/stdstring.h>
 #include <file/file_path.h>
-#include <file/file_extract.h>
+#include <file/file_archive.h>
 #include <retro_stat.h>
 
 #include "tasks.h"
diff --git a/tasks/task_http.c b/tasks/task_http.c
index d82c87b6e7..6bde2b11f0 100644
--- a/tasks/task_http.c
+++ b/tasks/task_http.c
@@ -20,7 +20,7 @@
 #include <string/stdstring.h>
 #include <compat/strl.h>
 #include <file/file_path.h>
-#include <file/file_extract.h>
+#include <file/file_archive.h>
 #include <net/net_compat.h>
 #include <retro_file.h>
 #include <retro_stat.h>