Removed archive description macros, moved those strings inline.
--- a/src/archiver_dir.c Fri Mar 23 00:52:32 2012 -0400
+++ b/src/archiver_dir.c Fri Mar 23 00:55:56 2012 -0400
@@ -181,7 +181,7 @@
const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_DIR =
{
"",
- DIR_ARCHIVE_DESCRIPTION,
+ "Non-archive, direct filesystem I/O",
"Ryan C. Gordon <icculus@icculus.org>",
"http://icculus.org/physfs/",
};
--- a/src/archiver_grp.c Fri Mar 23 00:52:32 2012 -0400
+++ b/src/archiver_grp.c Fri Mar 23 00:55:56 2012 -0400
@@ -88,7 +88,7 @@
const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_GRP =
{
"GRP",
- GRP_ARCHIVE_DESCRIPTION,
+ "Build engine Groupfile format",
"Ryan C. Gordon <icculus@icculus.org>",
"http://icculus.org/physfs/",
};
--- a/src/archiver_hog.c Fri Mar 23 00:52:32 2012 -0400
+++ b/src/archiver_hog.c Fri Mar 23 00:55:56 2012 -0400
@@ -94,7 +94,7 @@
const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_HOG =
{
"HOG",
- HOG_ARCHIVE_DESCRIPTION,
+ "Descent I/II HOG file format",
"Bradley Bell <btb@icculus.org>",
"http://icculus.org/physfs/",
};
--- a/src/archiver_lzma.c Fri Mar 23 00:52:32 2012 -0400
+++ b/src/archiver_lzma.c Fri Mar 23 00:55:56 2012 -0400
@@ -678,7 +678,7 @@
const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_LZMA =
{
"7Z",
- LZMA_ARCHIVE_DESCRIPTION,
+ "LZMA (7zip) format",
"Dennis Schridde <devurandom@gmx.net>",
"http://icculus.org/physfs/",
};
--- a/src/archiver_mvl.c Fri Mar 23 00:52:32 2012 -0400
+++ b/src/archiver_mvl.c Fri Mar 23 00:55:56 2012 -0400
@@ -81,7 +81,7 @@
const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_MVL =
{
"MVL",
- MVL_ARCHIVE_DESCRIPTION,
+ "Descent II Movielib format",
"Bradley Bell <btb@icculus.org>",
"http://icculus.org/physfs/",
};
--- a/src/archiver_qpak.c Fri Mar 23 00:52:32 2012 -0400
+++ b/src/archiver_qpak.c Fri Mar 23 00:55:56 2012 -0400
@@ -550,7 +550,7 @@
const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_QPAK =
{
"PAK",
- QPAK_ARCHIVE_DESCRIPTION,
+ "Quake I/II format",
"Ryan C. Gordon <icculus@icculus.org>",
"http://icculus.org/physfs/",
};
--- a/src/archiver_wad.c Fri Mar 23 00:52:32 2012 -0400
+++ b/src/archiver_wad.c Fri Mar 23 00:55:56 2012 -0400
@@ -105,7 +105,7 @@
const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_WAD =
{
"WAD",
- WAD_ARCHIVE_DESCRIPTION,
+ "DOOM engine format",
"Travis Wells <traviswells@mchsi.com>",
"http://www.3dmm2.com/doom/",
};
--- a/src/archiver_zip.c Fri Mar 23 00:52:32 2012 -0400
+++ b/src/archiver_zip.c Fri Mar 23 00:55:56 2012 -0400
@@ -1404,7 +1404,7 @@
const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_ZIP =
{
"ZIP",
- ZIP_ARCHIVE_DESCRIPTION,
+ "PkZip/WinZip/Info-Zip compatible",
"Ryan C. Gordon <icculus@icculus.org>",
"http://icculus.org/physfs/",
};
--- a/src/physfs_internal.h Fri Mar 23 00:52:32 2012 -0400
+++ b/src/physfs_internal.h Fri Mar 23 00:55:56 2012 -0400
@@ -118,15 +118,6 @@
#define PHYSFS_SUPPORTS_ISO9660 0
#endif
-#define DIR_ARCHIVE_DESCRIPTION "Non-archive, direct filesystem I/O"
-#define GRP_ARCHIVE_DESCRIPTION "Build engine Groupfile format"
-#define HOG_ARCHIVE_DESCRIPTION "Descent I/II HOG file format"
-#define MVL_ARCHIVE_DESCRIPTION "Descent II Movielib format"
-#define QPAK_ARCHIVE_DESCRIPTION "Quake I/II format"
-#define ZIP_ARCHIVE_DESCRIPTION "PkZip/WinZip/Info-Zip compatible"
-#define WAD_ARCHIVE_DESCRIPTION "DOOM engine format"
-#define LZMA_ARCHIVE_DESCRIPTION "LZMA (7zip) format"
-
/* !!! FIXME: find something better than "dvoid" and "fvoid" ... */
/* Opaque data for file and dir handlers... */