From 320b154a11440e39205f1973d6d5d47e08d5285f Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Fri, 23 Mar 2012 00:55:56 -0400 Subject: [PATCH] Removed archive description macros, moved those strings inline. --- src/archiver_dir.c | 2 +- src/archiver_grp.c | 2 +- src/archiver_hog.c | 2 +- src/archiver_lzma.c | 2 +- src/archiver_mvl.c | 2 +- src/archiver_qpak.c | 2 +- src/archiver_wad.c | 2 +- src/archiver_zip.c | 2 +- src/physfs_internal.h | 9 --------- 9 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/archiver_dir.c b/src/archiver_dir.c index 3af07076..84bba699 100644 --- a/src/archiver_dir.c +++ b/src/archiver_dir.c @@ -181,7 +181,7 @@ static int DIR_stat(dvoid *opaque, const char *name, int *exists, const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_DIR = { "", - DIR_ARCHIVE_DESCRIPTION, + "Non-archive, direct filesystem I/O", "Ryan C. Gordon ", "http://icculus.org/physfs/", }; diff --git a/src/archiver_grp.c b/src/archiver_grp.c index b4bb8d30..fc3bbae4 100644 --- a/src/archiver_grp.c +++ b/src/archiver_grp.c @@ -88,7 +88,7 @@ static void *GRP_openArchive(PHYSFS_Io *io, const char *name, int forWriting) const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_GRP = { "GRP", - GRP_ARCHIVE_DESCRIPTION, + "Build engine Groupfile format", "Ryan C. Gordon ", "http://icculus.org/physfs/", }; diff --git a/src/archiver_hog.c b/src/archiver_hog.c index d82f5c0a..7738f22c 100644 --- a/src/archiver_hog.c +++ b/src/archiver_hog.c @@ -94,7 +94,7 @@ static void *HOG_openArchive(PHYSFS_Io *io, const char *name, int forWriting) const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_HOG = { "HOG", - HOG_ARCHIVE_DESCRIPTION, + "Descent I/II HOG file format", "Bradley Bell ", "http://icculus.org/physfs/", }; diff --git a/src/archiver_lzma.c b/src/archiver_lzma.c index bff71566..b9f722cb 100644 --- a/src/archiver_lzma.c +++ b/src/archiver_lzma.c @@ -678,7 +678,7 @@ static int LZMA_stat(dvoid *opaque, const char *filename, int *exists, const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_LZMA = { "7Z", - LZMA_ARCHIVE_DESCRIPTION, + "LZMA (7zip) format", "Dennis Schridde ", "http://icculus.org/physfs/", }; diff --git a/src/archiver_mvl.c b/src/archiver_mvl.c index c68e112c..98ef9cb1 100644 --- a/src/archiver_mvl.c +++ b/src/archiver_mvl.c @@ -81,7 +81,7 @@ static void *MVL_openArchive(PHYSFS_Io *io, const char *name, int forWriting) const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_MVL = { "MVL", - MVL_ARCHIVE_DESCRIPTION, + "Descent II Movielib format", "Bradley Bell ", "http://icculus.org/physfs/", }; diff --git a/src/archiver_qpak.c b/src/archiver_qpak.c index b1eb1ca8..10531895 100644 --- a/src/archiver_qpak.c +++ b/src/archiver_qpak.c @@ -550,7 +550,7 @@ static int QPAK_stat(dvoid *opaque, const char *filename, int *exists, const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_QPAK = { "PAK", - QPAK_ARCHIVE_DESCRIPTION, + "Quake I/II format", "Ryan C. Gordon ", "http://icculus.org/physfs/", }; diff --git a/src/archiver_wad.c b/src/archiver_wad.c index 8266a224..8382baf5 100644 --- a/src/archiver_wad.c +++ b/src/archiver_wad.c @@ -105,7 +105,7 @@ static void *WAD_openArchive(PHYSFS_Io *io, const char *name, int forWriting) const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_WAD = { "WAD", - WAD_ARCHIVE_DESCRIPTION, + "DOOM engine format", "Travis Wells ", "http://www.3dmm2.com/doom/", }; diff --git a/src/archiver_zip.c b/src/archiver_zip.c index 1992e79d..13afad3a 100644 --- a/src/archiver_zip.c +++ b/src/archiver_zip.c @@ -1404,7 +1404,7 @@ static int ZIP_stat(dvoid *opaque, const char *filename, int *exists, const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_ZIP = { "ZIP", - ZIP_ARCHIVE_DESCRIPTION, + "PkZip/WinZip/Info-Zip compatible", "Ryan C. Gordon ", "http://icculus.org/physfs/", }; diff --git a/src/physfs_internal.h b/src/physfs_internal.h index 202afae5..4c0dab25 100644 --- a/src/physfs_internal.h +++ b/src/physfs_internal.h @@ -118,15 +118,6 @@ void __PHYSFS_smallFree(void *ptr); #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... */