thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Try to avoid possible global var name conflicts.

Browse source
This commit is contained in:
Unknown W. Brackets 2013-05-31 22:30:27 -07:00
parent f5abbe35ae
commit 7687bccce6
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Core/FileSystems/MetaFileSystem.cpp
View file

@ -171,7 +171,7 @@ IFileSystem *MetaFileSystem::GetHandleOwner(u32 handle)
return 0;
}
extern u32 errorCode;
extern u32 ioErrorCode;
bool MetaFileSystem::MapFilePath(const std::string &_inpath, std::string &outpath, MountPoint **system)
{
std::string realpath;
@ -193,7 +193,7 @@ bool MetaFileSystem::MapFilePath(const std::string &_inpath, std::string &outpat
//Attempt to emulate SCE_KERNEL_ERROR_NOCWD / 8002032C: may break things requiring fixes elsewhere
if (inpath.find(':') == std::string::npos /* means path is relative */)
{
errorCode = SCE_KERNEL_ERROR_NOCWD;
ioErrorCode = SCE_KERNEL_ERROR_NOCWD;
WARN_LOG_REPORT(HLE, "Path is relative, but current directory not set for thread %i. returning 8002032C(SCE_KERNEL_ERROR_NOCWD) instead.", currentThread, startingDirectory.c_str());
}
}

6
Core/HLE/sceIo.cpp
View file

@ -98,7 +98,7 @@ typedef s64 SceOff;
typedef u64 SceIores;
int asyncNotifyEvent = -1;
u32 errorCode = 0;
u32 ioErrorCode = 0;
#define SCE_STM_FDIR 0x1000
#define SCE_STM_FREG 0x2000
@ -744,7 +744,7 @@ FileNode *__IoOpen(const char* filename, int flags, int mode) {
PSPFileInfo info = pspFileSystem.GetFileInfo(filename);
errorCode = 0;
ioErrorCode = 0;
u32 h = pspFileSystem.OpenFile(filename, (FileAccess) access);
if (h == 0) {
@ -773,7 +773,7 @@ u32 sceIoOpen(const char* filename, int flags, int mode) {
if (f == NULL)
{
//Timing is not accurate, aiming low for now.
if(errorCode == SCE_KERNEL_ERROR_NOCWD)
if (ioErrorCode == SCE_KERNEL_ERROR_NOCWD)
{
ERROR_LOG(HLE, "SCE_KERNEL_ERROR_NOCWD=sceIoOpen(%s, %08x, %08x) - no current working directory", filename, flags, mode);
return hleDelayResult(SCE_KERNEL_ERROR_NOCWD , "no cwd", 10000);