libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-24 19:45:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PS2: Replace usage of strdup with scumm_strdup

Browse Source
This commit is contained in:
Cameron Cawley 2018-08-18 22:42:21 +01:00 committed by David Turner
parent 47c0e27017
commit 0e8f1261c5
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
backends/platform/ps2/savefilemgr.cpp
View File

@ -23,6 +23,7 @@
#define FORBIDDEN_SYMBOL_EXCEPTION_printf
#include "common/config-manager.h"
#include "common/str.h"
#include "common/zlib.h"
// #include "backends/saves/compressed/compressed-saves.h"
@ -115,8 +116,8 @@ Common::InSaveFile *Ps2SaveFileManager::openRawFile(const Common::String &filena
strcpy(temp, filename.c_str());
// mcSplit(temp, game, ext);
char *game = strdup(strtok(temp, "."));
char *ext = strdup(strtok(NULL, "*"));
char *game = scumm_strdup(strtok(temp, "."));
char *ext = scumm_strdup(strtok(NULL, "*"));
sprintf(path, "mc0:ScummVM/%s", game); // per game path
// mcCheck(path); // needed on load ?
@ -183,8 +184,8 @@ Common::OutSaveFile *Ps2SaveFileManager::openForSaving(const Common::String &fil
strcpy(temp, filename.c_str());
// mcSplit(temp, game, ext);
char *game = strdup(strtok(temp, "."));
char *ext = strdup(strtok(NULL, "*"));
char *game = scumm_strdup(strtok(temp, "."));
char *ext = scumm_strdup(strtok(NULL, "*"));
sprintf(path, "mc0:ScummVM/%s", game); // per game path
mcCheck(path);
sprintf(path, "mc0:ScummVM/%s/%s.sav", game, ext);
@ -217,8 +218,8 @@ bool Ps2SaveFileManager::removeSavefile(const Common::String &filename) {
strcpy(temp, filename.c_str());
// mcSplit(temp, game, ext);
char *game = strdup(strtok(temp, "."));
char *ext = strdup(strtok(NULL, "*"));
char *game = scumm_strdup(strtok(temp, "."));
char *ext = scumm_strdup(strtok(NULL, "*"));
sprintf(path, "mc0:ScummVM/%s", game); // per game path
mcCheck(path);
sprintf(path, "mc0:ScummVM/%s/%s.sav", game, ext);
@ -254,7 +255,7 @@ Common::StringArray Ps2SaveFileManager::listSavefiles(const Common::String &patt
strcpy(temp, pattern.c_str());
// mcSplit(temp, game, ext);
game = strdup(strtok(temp, "."));
game = scumm_strdup(strtok(temp, "."));
sprintf(path, "mc0:ScummVM/%s", game); // per game path
mcCheck(path);

3
backends/platform/ps2/systemps2.cpp
View File

@ -46,6 +46,7 @@
#include "common/events.h"
#include "common/file.h"
#include "common/scummsys.h"
#include "common/str.h"
#include "backends/platform/ps2/asyncfio.h"
#include "backends/platform/ps2/cd.h"
@ -1096,7 +1097,7 @@ void OSystem_PS2::makeConfigPath() {
else
ps2_fclose(src);
_configFile = strdup(path);
_configFile = scumm_strdup(path);
}
Common::String OSystem_PS2::getDefaultConfigFileName() {