walkero
/
physfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Killed some #ifdefs and whitespace.

This commit is contained in:
Ryan C. Gordon 2007-03-10 06:24:56 +00:00
parent d8f69c0e93
commit 9d42a71574
2 changed files with 4 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -5,7 +5,8 @@
03082007 - Fixed a comment in physfs.h. Renamed win32.c to windows.c. 03082007 - Fixed a comment in physfs.h. Renamed win32.c to windows.c.
Cleaned up whitespace/formatting in pocketpc.c. Updated PocketPC Cleaned up whitespace/formatting in pocketpc.c. Updated PocketPC
code to expect UTF-8 strings from the higher level. Changed code to expect UTF-8 strings from the higher level. Changed
PHYSFS_SUPPORTS_LZMA to PHYSFS_SUPPORTS_7Z. PHYSFS_SUPPORTS_LZMA to PHYSFS_SUPPORTS_7Z. Killed some #ifdefs
in physfs.c.
11052006 - More 7zip archiver work (thanks, Dennis!). Initial Unicode work. 11052006 - More 7zip archiver work (thanks, Dennis!). Initial Unicode work.
Minor BeOS realpath tweak. Minor BeOS realpath tweak.
09272006 - Reworked 7zip archiver (thanks, Dennis!). 09272006 - Reworked 7zip archiver (thanks, Dennis!).

43
physfs.c
View File

@ -54,48 +54,23 @@ typedef struct __PHYSFS_ERRMSGTYPE__
} ErrMsg; } ErrMsg;
/* The various i/o drivers... */ /* The various i/o drivers...some of these may not be compiled in. */
/* !!! FIXME: consolidate these into one struct? */
#if (defined PHYSFS_SUPPORTS_ZIP)
extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_ZIP; extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_ZIP;
extern const PHYSFS_Archiver __PHYSFS_Archiver_ZIP; extern const PHYSFS_Archiver __PHYSFS_Archiver_ZIP;
#endif
#if (defined PHYSFS_SUPPORTS_7Z)
extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_LZMA; extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_LZMA;
extern const PHYSFS_Archiver __PHYSFS_Archiver_LZMA; extern const PHYSFS_Archiver __PHYSFS_Archiver_LZMA;
#endif
#if (defined PHYSFS_SUPPORTS_GRP)
extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_GRP; extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_GRP;
extern const PHYSFS_Archiver __PHYSFS_Archiver_GRP; extern const PHYSFS_Archiver __PHYSFS_Archiver_GRP;
#endif
#if (defined PHYSFS_SUPPORTS_QPAK)
extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_QPAK; extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_QPAK;
extern const PHYSFS_Archiver __PHYSFS_Archiver_QPAK; extern const PHYSFS_Archiver __PHYSFS_Archiver_QPAK;
#endif
#if (defined PHYSFS_SUPPORTS_HOG)
extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_HOG; extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_HOG;
extern const PHYSFS_Archiver __PHYSFS_Archiver_HOG; extern const PHYSFS_Archiver __PHYSFS_Archiver_HOG;
#endif
#if (defined PHYSFS_SUPPORTS_MVL)
extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_MVL; extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_MVL;
extern const PHYSFS_Archiver __PHYSFS_Archiver_MVL; extern const PHYSFS_Archiver __PHYSFS_Archiver_MVL;
#endif
#if (defined PHYSFS_SUPPORTS_WAD)
extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_WAD; extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_WAD;
extern const PHYSFS_Archiver __PHYSFS_Archiver_WAD; extern const PHYSFS_Archiver __PHYSFS_Archiver_WAD;
#endif
#if (defined PHYSFS_SUPPORTS_MIX)
extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_MIX; extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_MIX;
extern const PHYSFS_Archiver __PHYSFS_Archiver_MIX; extern const PHYSFS_Archiver __PHYSFS_Archiver_MIX;
#endif
extern const PHYSFS_Archiver __PHYSFS_Archiver_DIR; extern const PHYSFS_Archiver __PHYSFS_Archiver_DIR;
@ -104,35 +79,27 @@ static const PHYSFS_ArchiveInfo *supported_types[] =
#if (defined PHYSFS_SUPPORTS_ZIP) #if (defined PHYSFS_SUPPORTS_ZIP)
&__PHYSFS_ArchiveInfo_ZIP, &__PHYSFS_ArchiveInfo_ZIP,
#endif #endif
#if (defined PHYSFS_SUPPORTS_7Z) #if (defined PHYSFS_SUPPORTS_7Z)
&__PHYSFS_ArchiveInfo_LZMA, &__PHYSFS_ArchiveInfo_LZMA,
#endif #endif
#if (defined PHYSFS_SUPPORTS_GRP) #if (defined PHYSFS_SUPPORTS_GRP)
&__PHYSFS_ArchiveInfo_GRP, &__PHYSFS_ArchiveInfo_GRP,
#endif #endif
#if (defined PHYSFS_SUPPORTS_QPAK) #if (defined PHYSFS_SUPPORTS_QPAK)
&__PHYSFS_ArchiveInfo_QPAK, &__PHYSFS_ArchiveInfo_QPAK,
#endif #endif
#if (defined PHYSFS_SUPPORTS_HOG) #if (defined PHYSFS_SUPPORTS_HOG)
&__PHYSFS_ArchiveInfo_HOG, &__PHYSFS_ArchiveInfo_HOG,
#endif #endif
#if (defined PHYSFS_SUPPORTS_MVL) #if (defined PHYSFS_SUPPORTS_MVL)
&__PHYSFS_ArchiveInfo_MVL, &__PHYSFS_ArchiveInfo_MVL,
#endif #endif
#if (defined PHYSFS_SUPPORTS_WAD) #if (defined PHYSFS_SUPPORTS_WAD)
&__PHYSFS_ArchiveInfo_WAD, &__PHYSFS_ArchiveInfo_WAD,
#endif #endif
#if (defined PHYSFS_SUPPORTS_MIX) #if (defined PHYSFS_SUPPORTS_MIX)
&__PHYSFS_ArchiveInfo_MIX, &__PHYSFS_ArchiveInfo_MIX,
#endif #endif
NULL NULL
}; };
@ -141,35 +108,27 @@ static const PHYSFS_Archiver *archivers[] =
#if (defined PHYSFS_SUPPORTS_ZIP) #if (defined PHYSFS_SUPPORTS_ZIP)
&__PHYSFS_Archiver_ZIP, &__PHYSFS_Archiver_ZIP,
#endif #endif
#if (defined PHYSFS_SUPPORTS_7Z) #if (defined PHYSFS_SUPPORTS_7Z)
&__PHYSFS_Archiver_LZMA, &__PHYSFS_Archiver_LZMA,
#endif #endif
#if (defined PHYSFS_SUPPORTS_GRP) #if (defined PHYSFS_SUPPORTS_GRP)
&__PHYSFS_Archiver_GRP, &__PHYSFS_Archiver_GRP,
#endif #endif
#if (defined PHYSFS_SUPPORTS_QPAK) #if (defined PHYSFS_SUPPORTS_QPAK)
&__PHYSFS_Archiver_QPAK, &__PHYSFS_Archiver_QPAK,
#endif #endif
#if (defined PHYSFS_SUPPORTS_HOG) #if (defined PHYSFS_SUPPORTS_HOG)
&__PHYSFS_Archiver_HOG, &__PHYSFS_Archiver_HOG,
#endif #endif
#if (defined PHYSFS_SUPPORTS_MVL) #if (defined PHYSFS_SUPPORTS_MVL)
&__PHYSFS_Archiver_MVL, &__PHYSFS_Archiver_MVL,
#endif #endif
#if (defined PHYSFS_SUPPORTS_WAD) #if (defined PHYSFS_SUPPORTS_WAD)
&__PHYSFS_Archiver_WAD, &__PHYSFS_Archiver_WAD,
#endif #endif
#if (defined PHYSFS_SUPPORTS_MIX) #if (defined PHYSFS_SUPPORTS_MIX)
&__PHYSFS_Archiver_MIX, &__PHYSFS_Archiver_MIX,
#endif #endif
&__PHYSFS_Archiver_DIR, &__PHYSFS_Archiver_DIR,
NULL NULL
}; };