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

8
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,12 +773,12 @@ 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);
}
else
else
{
ERROR_LOG(HLE, "ERROR_ERRNO_FILE_NOT_FOUND=sceIoOpen(%s, %08x, %08x) - file not found", filename, flags, mode);
return hleDelayResult(ERROR_ERRNO_FILE_NOT_FOUND , "file opened", 10000);