ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

in progress: cleanup of multiplatformness of archive io apis

This commit is contained in:
zeromus 2008-08-13 07:49:48 +00:00
parent bec2d54b54
commit 85a03592c1
3 changed files with 4 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver.h
View File

@ -13,7 +13,9 @@ FILE *FCEUD_UTF8fopen(const char *fn, const char *mode);
inline FILE *FCEUD_UTF8fopen(const std::string &n, const char *mode) { return FCEUD_UTF8fopen(n.c_str(),mode); } inline FILE *FCEUD_UTF8fopen(const std::string &n, const char *mode) { return FCEUD_UTF8fopen(n.c_str(),mode); }
std::fstream* FCEUD_UTF8_fstream(const char *n, const char *m); std::fstream* FCEUD_UTF8_fstream(const char *n, const char *m);
inline std::fstream* FCEUD_UTF8_fstream(const std::string &n, const char *m) { return FCEUD_UTF8_fstream(n.c_str(),m); } inline std::fstream* FCEUD_UTF8_fstream(const std::string &n, const char *m) { return FCEUD_UTF8_fstream(n.c_str(),m); }
FCEUFILE* FCEUD_OpenArchiveIndex(ArchiveScanRecord& asr, std::string& fname, int innerIndex);
FCEUFILE* FCEUD_OpenArchive(ArchiveScanRecord& asr, std::string& fname, std::string* innerFilename);
ArchiveScanRecord FCEUD_ScanArchive(std::string fname);
//mbg 7/23/06 //mbg 7/23/06
const char *FCEUD_GetCompilerString(); const char *FCEUD_GetCompilerString();

2
src/drivers/win/archive.cpp
View File

@ -451,7 +451,7 @@ ArchiveScanRecord FCEUD_ScanArchive(std::string fname)
extern HWND hAppWnd; extern HWND hAppWnd;
FCEUFILE* FCEUD_OpenArchive(ArchiveScanRecord& asr, std::string& fname, std::string* innerFilename, int innerIndex) static FCEUFILE* FCEUD_OpenArchive(ArchiveScanRecord& asr, std::string& fname, std::string* innerFilename, int innerIndex)
{ {
FCEUFILE* fp = 0; FCEUFILE* fp = 0;

44
src/file.cpp
View File

@ -30,10 +30,6 @@
#include <zlib.h> #include <zlib.h>
#endif #endif
#ifdef WIN32
#include <drivers/win/archive.h>
#endif
#include "types.h" #include "types.h"
#include "file.h" #include "file.h"
#include "utils/endian.h" #include "utils/endian.h"
@ -175,46 +171,6 @@ FileBaseInfo CurrentFileBase() {
} }
FileBaseInfo DetermineFileBase(const char *f) { FileBaseInfo DetermineFileBase(const char *f) {
//const char *tp1,*tp3;
//char FileBase[2048];
//char FileBaseDirectory[2048];
//char FileExt[2048];
//#if PSS_STYLE==4
// tp1=((char *)strrchr(f,':'));
//#elif PSS_STYLE==1
// tp1=((char *)strrchr(f,'/'));
//#else
// tp1=((char *)strrchr(f,'\\'));
//#if PSS_STYLE!=3
// tp3=((char *)strrchr(f,'/'));
// if(tp1<tp3) tp1=tp3;
//#endif
//#endif
//if(!tp1)
//{
// tp1=f;
// strcpy(FileBaseDirectory,".");
//}
//else
//{
// memcpy(FileBaseDirectory,f,tp1-f);
// FileBaseDirectory[tp1-f]=0;
// tp1++;
//}
//if(((tp3=strrchr(f,'.'))!=NULL) && (tp3>tp1))
//{
// memcpy(FileBase,tp1,tp3-tp1);
// FileBase[tp3-tp1]=0;
// strcpy(FileExt,tp3);
//}
//else
//{
// strcpy(FileBase,tp1);
// FileExt[0]=0;
//}
char drv[PATH_MAX], dir[PATH_MAX], name[PATH_MAX], ext[PATH_MAX]; char drv[PATH_MAX], dir[PATH_MAX], name[PATH_MAX], ext[PATH_MAX];
splitpath(f,drv,dir,name,ext); splitpath(f,drv,dir,name,ext);