Rearranged PHYSFS_Archiver struct.
authorRyan C. Gordon <icculus@icculus.org>
Fri, 30 Nov 2012 14:09:56 -0500
changeset 1331 eb06a37afa7e
parent 1330 ce6b4a66b3eb
child 1332 e0dbcd5e50b9
Rearranged PHYSFS_Archiver struct.
src/archiver_dir.c
src/archiver_grp.c
src/archiver_hog.c
src/archiver_iso9660.c
src/archiver_lzma.c
src/archiver_mvl.c
src/archiver_qpak.c
src/archiver_slb.c
src/archiver_wad.c
src/archiver_zip.c
src/physfs.h
--- a/src/archiver_dir.c	Fri Nov 30 14:06:21 2012 -0500
+++ b/src/archiver_dir.c	Fri Nov 30 14:09:56 2012 -0500
@@ -183,8 +183,8 @@
     DIR_openAppend,
     DIR_remove,
     DIR_mkdir,
-    DIR_closeArchive,
-    DIR_stat
+    DIR_stat,
+    DIR_closeArchive
 };
 
 /* end of archiver_dir.c ... */
--- a/src/archiver_grp.c	Fri Nov 30 14:06:21 2012 -0500
+++ b/src/archiver_grp.c	Fri Nov 30 14:09:56 2012 -0500
@@ -102,8 +102,8 @@
     UNPK_openAppend,
     UNPK_remove,
     UNPK_mkdir,
-    UNPK_closeArchive,
-    UNPK_stat
+    UNPK_stat,
+    UNPK_closeArchive
 };
 
 #endif  /* defined PHYSFS_SUPPORTS_GRP */
--- a/src/archiver_hog.c	Fri Nov 30 14:06:21 2012 -0500
+++ b/src/archiver_hog.c	Fri Nov 30 14:09:56 2012 -0500
@@ -108,8 +108,8 @@
     UNPK_openAppend,
     UNPK_remove,
     UNPK_mkdir,
-    UNPK_closeArchive,
-    UNPK_stat
+    UNPK_stat,
+    UNPK_closeArchive
 };
 
 #endif  /* defined PHYSFS_SUPPORTS_HOG */
--- a/src/archiver_iso9660.c	Fri Nov 30 14:06:21 2012 -0500
+++ b/src/archiver_iso9660.c	Fri Nov 30 14:09:56 2012 -0500
@@ -951,8 +951,8 @@
     ISO9660_openAppend,
     ISO9660_remove,
     ISO9660_mkdir,
-    ISO9660_closeArchive,
-    ISO9660_stat
+    ISO9660_stat,
+    ISO9660_closeArchive
 };
 
 #endif  /* defined PHYSFS_SUPPORTS_ISO9660 */
--- a/src/archiver_lzma.c	Fri Nov 30 14:06:21 2012 -0500
+++ b/src/archiver_lzma.c	Fri Nov 30 14:09:56 2012 -0500
@@ -689,8 +689,8 @@
     LZMA_openAppend,
     LZMA_remove,
     LZMA_mkdir,
-    LZMA_closeArchive,
-    LZMA_stat
+    LZMA_stat,
+    LZMA_closeArchive
 };
 
 #endif  /* defined PHYSFS_SUPPORTS_7Z */
--- a/src/archiver_mvl.c	Fri Nov 30 14:06:21 2012 -0500
+++ b/src/archiver_mvl.c	Fri Nov 30 14:09:56 2012 -0500
@@ -95,8 +95,8 @@
     UNPK_openAppend,
     UNPK_remove,
     UNPK_mkdir,
-    UNPK_closeArchive,
-    UNPK_stat
+    UNPK_stat,
+    UNPK_closeArchive
 };
 
 #endif  /* defined PHYSFS_SUPPORTS_MVL */
--- a/src/archiver_qpak.c	Fri Nov 30 14:06:21 2012 -0500
+++ b/src/archiver_qpak.c	Fri Nov 30 14:09:56 2012 -0500
@@ -111,8 +111,8 @@
     UNPK_openAppend,
     UNPK_remove,
     UNPK_mkdir,
-    UNPK_closeArchive,
-    UNPK_stat
+    UNPK_stat,
+    UNPK_closeArchive
 };
 
 #endif  /* defined PHYSFS_SUPPORTS_QPAK */
--- a/src/archiver_slb.c	Fri Nov 30 14:06:21 2012 -0500
+++ b/src/archiver_slb.c	Fri Nov 30 14:09:56 2012 -0500
@@ -116,8 +116,8 @@
     UNPK_openAppend,
     UNPK_remove,
     UNPK_mkdir,
-    UNPK_closeArchive,
-    UNPK_stat
+    UNPK_stat,
+    UNPK_closeArchive
 };
 
 #endif  /* defined PHYSFS_SUPPORTS_SLB */
--- a/src/archiver_wad.c	Fri Nov 30 14:06:21 2012 -0500
+++ b/src/archiver_wad.c	Fri Nov 30 14:09:56 2012 -0500
@@ -119,8 +119,8 @@
     UNPK_openAppend,
     UNPK_remove,
     UNPK_mkdir,
-    UNPK_closeArchive,
-    UNPK_stat
+    UNPK_stat,
+    UNPK_closeArchive
 };
 
 #endif  /* defined PHYSFS_SUPPORTS_WAD */
--- a/src/archiver_zip.c	Fri Nov 30 14:06:21 2012 -0500
+++ b/src/archiver_zip.c	Fri Nov 30 14:09:56 2012 -0500
@@ -1702,8 +1702,8 @@
     ZIP_openAppend,
     ZIP_remove,
     ZIP_mkdir,
-    ZIP_closeArchive,
-    ZIP_stat
+    ZIP_stat,
+    ZIP_closeArchive
 };
 
 #endif  /* defined PHYSFS_SUPPORTS_ZIP */
--- a/src/physfs.h	Fri Nov 30 14:06:21 2012 -0500
+++ b/src/physfs.h	Fri Nov 30 14:09:56 2012 -0500
@@ -3477,7 +3477,13 @@
      */
     int (*mkdir)(void *opaque, const char *filename);
 
-    // !!! FIXME: reorder these methods.
+    /**
+     * Obtain basic file metadata.
+     *  Returns non-zero on success, zero on failure.
+     *  On failure, call PHYSFS_setErrorCode().
+     */
+    int (*stat)(void *opaque, const char *fn, PHYSFS_Stat *stat);
+
     /**
      * Close directories/archives, and free any associated memory,
      *  including the original PHYSFS_Io and (opaque) itself, if
@@ -3485,13 +3491,6 @@
      *  there are still files open from this archive.
      */
     void (*closeArchive)(void *opaque);
-
-    /**
-     * Obtain basic file metadata.
-     *  Returns non-zero on success, zero on failure.
-     *  On failure, call PHYSFS_setErrorCode().
-     */
-    int (*stat)(void *opaque, const char *fn, PHYSFS_Stat *stat);
 } PHYSFS_Archiver;
 
 /**