From f99f0ef9e7c830e1948f28512f61978cf4ae9c1e Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Sun, 22 Aug 2010 00:37:25 -0400 Subject: [PATCH] Fixed details of PHYSFS_Archiver's stat method. --- 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 | 13 ++++++------- 9 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/archiver_dir.c b/src/archiver_dir.c index 99d6640..ba84fc3 100644 --- a/src/archiver_dir.c +++ b/src/archiver_dir.c @@ -237,7 +237,7 @@ static void DIR_dirClose(dvoid *opaque) } /* DIR_dirClose */ -static int DIR_stat(fvoid *opaque, const char *name, int *exists, +static int DIR_stat(dvoid *opaque, const char *name, int *exists, PHYSFS_Stat *stat) { char *d = __PHYSFS_platformCvtToDependent((char *) opaque, name, NULL); diff --git a/src/archiver_grp.c b/src/archiver_grp.c index 0f7e2f5..5fa84df 100644 --- a/src/archiver_grp.c +++ b/src/archiver_grp.c @@ -433,7 +433,7 @@ static int GRP_mkdir(dvoid *opaque, const char *name) } /* GRP_mkdir */ -static int GRP_stat(fvoid *opaque, const char *filename, int *exists, +static int GRP_stat(dvoid *opaque, const char *filename, int *exists, PHYSFS_Stat *stat) { const GRPinfo *info = (const GRPinfo *) opaque; diff --git a/src/archiver_hog.c b/src/archiver_hog.c index 90fcae3..e360db4 100644 --- a/src/archiver_hog.c +++ b/src/archiver_hog.c @@ -468,7 +468,7 @@ static int HOG_mkdir(dvoid *opaque, const char *name) } /* HOG_mkdir */ -static int HOG_stat(fvoid *opaque, const char *filename, int *exists, +static int HOG_stat(dvoid *opaque, const char *filename, int *exists, PHYSFS_Stat *stat) { const HOGinfo *info = (const HOGinfo *) opaque; diff --git a/src/archiver_lzma.c b/src/archiver_lzma.c index 95ec35f..52bd981 100644 --- a/src/archiver_lzma.c +++ b/src/archiver_lzma.c @@ -688,7 +688,7 @@ static int LZMA_mkdir(dvoid *opaque, const char *name) BAIL_MACRO(ERR_NOT_SUPPORTED, 0); } /* LZMA_mkdir */ -static int LZMA_stat(fvoid *opaque, const char *filename, int *exists, +static int LZMA_stat(dvoid *opaque, const char *filename, int *exists, PHYSFS_Stat *stat) { const LZMAarchive *archive = (const LZMAarchive *) opaque; diff --git a/src/archiver_mvl.c b/src/archiver_mvl.c index bbdb364..c852b92 100644 --- a/src/archiver_mvl.c +++ b/src/archiver_mvl.c @@ -428,7 +428,7 @@ static int MVL_mkdir(dvoid *opaque, const char *name) } /* MVL_mkdir */ -static int MVL_stat(fvoid *opaque, const char *filename, int *exists, +static int MVL_stat(dvoid *opaque, const char *filename, int *exists, PHYSFS_Stat *stat) { const MVLinfo *info = (const MVLinfo *) opaque; diff --git a/src/archiver_qpak.c b/src/archiver_qpak.c index cc49248..dc94855 100644 --- a/src/archiver_qpak.c +++ b/src/archiver_qpak.c @@ -581,7 +581,7 @@ static int QPAK_mkdir(dvoid *opaque, const char *name) } /* QPAK_mkdir */ -static int QPAK_stat(fvoid *opaque, const char *filename, int *exists, +static int QPAK_stat(dvoid *opaque, const char *filename, int *exists, PHYSFS_Stat *stat) { int isDir = 0; diff --git a/src/archiver_wad.c b/src/archiver_wad.c index 2672251..f8edd52 100644 --- a/src/archiver_wad.c +++ b/src/archiver_wad.c @@ -487,7 +487,7 @@ static int WAD_mkdir(dvoid *opaque, const char *name) } /* WAD_mkdir */ -static int WAD_stat(fvoid *opaque, const char *filename, int *exists, +static int WAD_stat(dvoid *opaque, const char *filename, int *exists, PHYSFS_Stat *stat) { const WADinfo *info = (const WADinfo *) opaque; diff --git a/src/archiver_zip.c b/src/archiver_zip.c index bd2cc3b..844ce98 100644 --- a/src/archiver_zip.c +++ b/src/archiver_zip.c @@ -1399,7 +1399,7 @@ static int ZIP_mkdir(dvoid *opaque, const char *name) } /* ZIP_mkdir */ -static int ZIP_stat(fvoid *opaque, const char *filename, int *exists, +static int ZIP_stat(dvoid *opaque, const char *filename, int *exists, PHYSFS_Stat *stat) { int isDir = 0; diff --git a/src/physfs_internal.h b/src/physfs_internal.h index aa361f5..48ae1b2 100644 --- a/src/physfs_internal.h +++ b/src/physfs_internal.h @@ -890,6 +890,12 @@ typedef struct */ void (*dirClose)(dvoid *opaque); + /* + * Obtain basic file metadata. + * Returns non-zero on success, zero on failure. + * On failure, call __PHYSFS_setError(). + */ + int (*stat)(dvoid *opaque, const char *fn, int *exists, PHYSFS_Stat *stat); /* @@ -944,13 +950,6 @@ typedef struct * file. On failure, call __PHYSFS_setError(). */ int (*fileClose)(fvoid *opaque); - - /* !!! FIXME: return info (may be|is) wrong. - * Obtain basic file metadata. - * Returns non-zero on success, zero if can't close - * file. On failure, call __PHYSFS_setError(). - */ - int (*stat)(fvoid *opaque, const char *fn, int *exists, PHYSFS_Stat *stat); } PHYSFS_Archiver;