libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-04 16:26:53 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

DefaultSaveFileManager: Killed class StdioSaveFile, used FilesystemNode::openForReading()/openForWriting() instead (may cause regressions, watch out)

Browse Source 
svn-id: r33608
This commit is contained in:
Max Horn 2008-08-04 11:48:33 +00:00
parent 73cbcd33e0
commit d061e50a7e
1 changed files with 4 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
backends/saves/default/default-saves.cpp
View File

@ -41,53 +41,6 @@
#include <sys/stat.h>
#endif
class StdioSaveFile : public Common::InSaveFile, public Common::OutSaveFile {
private:
FILE *fh;
public:
StdioSaveFile(const char *filename, bool saveOrLoad) {
fh = ::fopen(filename, (saveOrLoad? "wb" : "rb"));
}
~StdioSaveFile() {
if (fh)
::fclose(fh);
}
bool eos() const { return feof(fh) != 0; }
bool ioFailed() const { return ferror(fh) != 0; }
void clearIOFailed() { clearerr(fh); }
bool isOpen() const { return fh != 0; }
uint32 read(void *dataPtr, uint32 dataSize) {
assert(fh);
return fread(dataPtr, 1, dataSize, fh);
}
uint32 write(const void *dataPtr, uint32 dataSize) {
assert(fh);
return fwrite(dataPtr, 1, dataSize, fh);
}
uint32 pos() const {
assert(fh);
return ftell(fh);
}
uint32 size() const {
assert(fh);
uint32 oldPos = ftell(fh);
fseek(fh, 0, SEEK_END);
uint32 length = ftell(fh);
fseek(fh, oldPos, SEEK_SET);
return length;
}
void seek(int32 offs, int whence = SEEK_SET) {
assert(fh);
fseek(fh, offs, whence);
}
};
Common::StringList DefaultSaveFileManager::listSavefiles(const char *pattern) {
FilesystemNode savePath(getSavePath());
FSList savefiles;
@ -183,13 +136,8 @@ Common::InSaveFile *DefaultSaveFileManager::openForLoading(const char *filename)
FilesystemNode saveDir(getSavePath());
FilesystemNode file = saveDir.getChild(filename);
// TODO: switch to file.openForLoading()
StdioSaveFile *sf = new StdioSaveFile(file.getPath().c_str(), false);
if (!sf->isOpen()) {
delete sf;
sf = 0;
}
// Open the file for reading
Common::SeekableReadStream *sf = file.openForReading();
return wrapInSaveFile(sf);
} else {
@ -206,13 +154,8 @@ Common::OutSaveFile *DefaultSaveFileManager::openForSaving(const char *filename)
FilesystemNode saveDir(getSavePath());
FilesystemNode file = saveDir.getChild(filename);
// TODO: switch to file.openForSaving()
StdioSaveFile *sf = new StdioSaveFile(file.getPath().c_str(), true);
if (!sf->isOpen()) {
delete sf;
sf = 0;
}
// Open the file for saving
Common::WriteStream *sf = file.openForWriting();
return wrapOutSaveFile(sf);
} else {