Rename file_extract to file_archive

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

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>

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>
 

database_info.c

@@ -17,7 +17,6 @@
 
 #include <stdint.h>
 
-#include <file/file_extract.h>
 #include <retro_endianness.h>
 
 #include "dir_list_special.h"

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"
 

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>
 

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;
 

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

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"
 

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>

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" {

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>

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"

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"

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>