diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp index cd39374d6f..fd2cb461d2 100644 --- a/Core/HLE/sceIo.cpp +++ b/Core/HLE/sceIo.cpp @@ -220,7 +220,7 @@ u32 sceKernelStderr() { } void __IoCompleteAsyncIO(SceUID id) { - u32 error=0; + u32 error; FileNode *f = kernelObjects.Get < FileNode > (id, error); if (f) { if (f->callbackID) { @@ -344,7 +344,7 @@ s64 sceIoLseek(int id, s64 offset, int whence) { } u32 sceIoLseek32(int id, int offset, int whence) { - u32 error=0; + u32 error; FileNode *f = kernelObjects.Get < FileNode > (id, error); if (f) { DEBUG_LOG(HLE, "sceIoLseek32(%d,%08x,%i)", id, (int) offset, whence); @@ -708,7 +708,7 @@ u32 sceIoSetAsyncCallback(int id, u32 clbckId, u32 clbckArg) DEBUG_LOG(HLE, "sceIoSetAsyncCallback(%d, %i, %08x)", id, clbckId, clbckArg); - u32 error=0; + u32 error; FileNode *f = kernelObjects.Get < FileNode > (id, error); if (f) { @@ -751,7 +751,7 @@ u32 sceIoReadAsync(int id, u32 data_addr, int size) u32 sceIoGetAsyncStat(int id, u32 poll, u32 address) { - u32 error=0; + u32 error; FileNode *f = kernelObjects.Get < FileNode > (id, error); if (f) { @@ -770,7 +770,7 @@ u32 sceIoGetAsyncStat(int id, u32 poll, u32 address) } int sceIoWaitAsync(int id, u32 address) { - u32 error=0; + u32 error; FileNode *f = kernelObjects.Get < FileNode > (id, error); if (f) { u64 res = f->asyncResult; @@ -791,7 +791,7 @@ int sceIoWaitAsync(int id, u32 address) { int sceIoWaitAsyncCB(int id, u32 address) { // Should process callbacks here - u32 error=0; + u32 error; FileNode *f = kernelObjects.Get < FileNode > (id, error); if (f) { u64 res = f->asyncResult; @@ -813,7 +813,7 @@ int sceIoWaitAsyncCB(int id, u32 address) { } u32 sceIoPollAsync(int id, u32 address) { - u32 error=0; + u32 error; FileNode *f = kernelObjects.Get < FileNode > (id, error); if (f) { u64 res = f->asyncResult; @@ -859,7 +859,7 @@ u32 sceIoDopen(const char *path) { } u32 sceIoDread(int id, u32 dirent_addr) { - u32 error=0; + u32 error; DirListing *dir = kernelObjects.Get(id, error); if (dir) { if (dir->index == (int) dir->listing.size()) { diff --git a/Core/HLE/sceKernelAlarm.cpp b/Core/HLE/sceKernelAlarm.cpp index 7b0df87b44..4e378b2a49 100644 --- a/Core/HLE/sceKernelAlarm.cpp +++ b/Core/HLE/sceKernelAlarm.cpp @@ -84,7 +84,7 @@ void __KernelTriggerAlarm(u64 userdata, int cyclesLate) { int uid = (int) userdata; - u32 error=0; + u32 error; Alarm *alarm = kernelObjects.Get(uid, error); if (alarm) __TriggerInterrupt(PSP_INTR_IMMEDIATE, PSP_SYSTIMER0_INTR, uid); @@ -152,7 +152,7 @@ int sceKernelCancelAlarm(SceUID uid) int sceKernelReferAlarmStatus(SceUID uid, u32 infoPtr) { - u32 error=0; + u32 error; Alarm *alarm = kernelObjects.Get(uid, error); if (!alarm) { diff --git a/Core/HLE/sceKernelEventFlag.cpp b/Core/HLE/sceKernelEventFlag.cpp index 42df1072dd..a28c06c0d6 100644 --- a/Core/HLE/sceKernelEventFlag.cpp +++ b/Core/HLE/sceKernelEventFlag.cpp @@ -204,7 +204,7 @@ u32 sceKernelCancelEventFlag(SceUID uid, u32 pattern, u32 numWaitThreadsPtr) { DEBUG_LOG(HLE, "sceKernelCancelEventFlag(%i, %08X, %08X)", uid, pattern, numWaitThreadsPtr); - u32 error=0; + u32 error; EventFlag *e = kernelObjects.Get(uid, error); if (e) { @@ -225,7 +225,7 @@ u32 sceKernelCancelEventFlag(SceUID uid, u32 pattern, u32 numWaitThreadsPtr) u32 sceKernelClearEventFlag(SceUID id, u32 bits) { - u32 error=0; + u32 error; EventFlag *e = kernelObjects.Get(id, error); if (e) { @@ -245,7 +245,7 @@ u32 sceKernelDeleteEventFlag(SceUID uid) { DEBUG_LOG(HLE, "sceKernelDeleteEventFlag(%i)", uid); - u32 error=0; + u32 error; EventFlag *e = kernelObjects.Get(uid, error); if (e) { @@ -261,7 +261,7 @@ u32 sceKernelDeleteEventFlag(SceUID uid) u32 sceKernelSetEventFlag(SceUID id, u32 bitsToSet) { - u32 error=0; + u32 error; DEBUG_LOG(HLE, "sceKernelSetEventFlag(%i, %08x)", id, bitsToSet); EventFlag *e = kernelObjects.Get(id, error); if (e) @@ -367,7 +367,7 @@ int sceKernelWaitEventFlag(SceUID id, u32 bits, u32 wait, u32 outBitsPtr, u32 ti if (bits == 0) return SCE_KERNEL_ERROR_EVF_ILPAT; - u32 error=0; + u32 error; EventFlag *e = kernelObjects.Get(id, error); if (e) { @@ -420,7 +420,7 @@ int sceKernelWaitEventFlagCB(SceUID id, u32 bits, u32 wait, u32 outBitsPtr, u32 if (bits == 0) return SCE_KERNEL_ERROR_EVF_ILPAT; - u32 error=0; + u32 error; EventFlag *e = kernelObjects.Get(id, error); if (e) { @@ -481,7 +481,7 @@ int sceKernelPollEventFlag(SceUID id, u32 bits, u32 wait, u32 outBitsPtr, u32 ti if (bits == 0) return SCE_KERNEL_ERROR_EVF_ILPAT; - u32 error=0; + u32 error; EventFlag *e = kernelObjects.Get(id, error); if (e) { @@ -511,7 +511,7 @@ int sceKernelPollEventFlag(SceUID id, u32 bits, u32 wait, u32 outBitsPtr, u32 ti u32 sceKernelReferEventFlagStatus(SceUID id, u32 statusPtr) { DEBUG_LOG(HLE, "sceKernelReferEventFlagStatus(%i, %08x)", id, statusPtr); - u32 error=0; + u32 error; EventFlag *e = kernelObjects.Get(id, error); if (e) { diff --git a/Core/HLE/sceKernelMbx.cpp b/Core/HLE/sceKernelMbx.cpp index 5eebea0387..c8c758a215 100644 --- a/Core/HLE/sceKernelMbx.cpp +++ b/Core/HLE/sceKernelMbx.cpp @@ -295,7 +295,7 @@ SceUID sceKernelCreateMbx(const char *name, u32 attr, u32 optAddr) int sceKernelDeleteMbx(SceUID id) { - u32 error=0; + u32 error; Mbx *m = kernelObjects.Get(id, error); if (m) { @@ -318,7 +318,7 @@ int sceKernelDeleteMbx(SceUID id) int sceKernelSendMbx(SceUID id, u32 packetAddr) { - u32 error=0; + u32 error; Mbx *m = kernelObjects.Get(id, error); if (!m) { @@ -410,7 +410,7 @@ int sceKernelSendMbx(SceUID id, u32 packetAddr) int sceKernelReceiveMbx(SceUID id, u32 packetAddrPtr, u32 timeoutPtr) { - u32 error=0; + u32 error; Mbx *m = kernelObjects.Get(id, error); if (!m) @@ -437,7 +437,7 @@ int sceKernelReceiveMbx(SceUID id, u32 packetAddrPtr, u32 timeoutPtr) int sceKernelReceiveMbxCB(SceUID id, u32 packetAddrPtr, u32 timeoutPtr) { - u32 error=0; + u32 error; Mbx *m = kernelObjects.Get(id, error); if (!m) @@ -465,7 +465,7 @@ int sceKernelReceiveMbxCB(SceUID id, u32 packetAddrPtr, u32 timeoutPtr) int sceKernelPollMbx(SceUID id, u32 packetAddrPtr) { - u32 error=0; + u32 error; Mbx *m = kernelObjects.Get(id, error); if (!m) @@ -488,7 +488,7 @@ int sceKernelPollMbx(SceUID id, u32 packetAddrPtr) int sceKernelCancelReceiveMbx(SceUID id, u32 numWaitingThreadsAddr) { - u32 error=0; + u32 error; Mbx *m = kernelObjects.Get(id, error); if (!m) @@ -515,7 +515,7 @@ int sceKernelCancelReceiveMbx(SceUID id, u32 numWaitingThreadsAddr) int sceKernelReferMbxStatus(SceUID id, u32 infoAddr) { - u32 error=0; + u32 error; Mbx *m = kernelObjects.Get(id, error); if (!m) { diff --git a/Core/HLE/sceKernelMemory.cpp b/Core/HLE/sceKernelMemory.cpp index edd94ddb7c..5513850417 100644 --- a/Core/HLE/sceKernelMemory.cpp +++ b/Core/HLE/sceKernelMemory.cpp @@ -167,7 +167,7 @@ void sceKernelCreateFpl() void sceKernelDeleteFpl() { SceUID id = PARAM(0); - u32 error=0; + u32 error; FPL *fpl = kernelObjects.Get(id, error); if (fpl) { @@ -184,7 +184,7 @@ void sceKernelDeleteFpl() void sceKernelAllocateFpl() { SceUID id = PARAM(0); - u32 error=0; + u32 error; FPL *fpl = kernelObjects.Get(id, error); if (fpl) { @@ -214,7 +214,7 @@ void sceKernelAllocateFpl() void sceKernelAllocateFplCB() { SceUID id = PARAM(0); - u32 error=0; + u32 error; FPL *fpl = kernelObjects.Get(id, error); if (fpl) { @@ -243,7 +243,7 @@ void sceKernelAllocateFplCB() void sceKernelTryAllocateFpl() { SceUID id = PARAM(0); - u32 error=0; + u32 error; FPL *fpl = kernelObjects.Get(id, error); if (fpl) { @@ -272,7 +272,7 @@ void sceKernelFreeFpl() u32 blockAddr = PARAM(1); DEBUG_LOG(HLE,"sceKernelFreeFpl(%i, %08x)", id, blockAddr); - u32 error=0; + u32 error; FPL *fpl = kernelObjects.Get(id, error); if (fpl) { int blockNum = (blockAddr - fpl->address) / fpl->nf.blocksize; @@ -295,7 +295,7 @@ void sceKernelCancelFpl() { SceUID id = PARAM(0); DEBUG_LOG(HLE,"UNIMPL: sceKernelCancelFpl(%i)", id); - u32 error=0; + u32 error; FPL *fpl = kernelObjects.Get(id, error); if (fpl) { @@ -312,7 +312,7 @@ void sceKernelReferFplStatus() SceUID id = PARAM(0); u32 statusAddr = PARAM(1); DEBUG_LOG(HLE,"sceKernelReferFplStatus(%i, %08x)", id, statusAddr); - u32 error=0; + u32 error; FPL *fpl = kernelObjects.Get(id, error); if (fpl) { @@ -415,7 +415,7 @@ void sceKernelGetBlockHeadAddr() { SceUID id = PARAM(0); - u32 error=0; + u32 error; PartitionMemoryBlock *block = kernelObjects.Get(id, error); if (block) { @@ -480,7 +480,7 @@ void sceKernelDeleteVpl() { SceUID id = PARAM(0); DEBUG_LOG(HLE,"sceKernelDeleteVpl(%i)", id); - u32 error=0; + u32 error; VPL *vpl = kernelObjects.Get(id, error); if (vpl) { @@ -498,7 +498,7 @@ void sceKernelAllocateVpl() { SceUID id = PARAM(0); DEBUG_LOG(HLE,"sceKernelAllocateVpl()"); - u32 error=0; + u32 error; VPL *vpl = kernelObjects.Get(id, error); if (vpl) { @@ -527,7 +527,7 @@ void sceKernelAllocateVpl() void sceKernelAllocateVplCB() { SceUID id = PARAM(0); - u32 error=0; + u32 error; VPL *vpl = kernelObjects.Get(id, error); if (vpl) { @@ -557,7 +557,7 @@ void sceKernelAllocateVplCB() void sceKernelTryAllocateVpl() { SceUID id = PARAM(0); - u32 error=0; + u32 error; VPL *vpl = kernelObjects.Get(id, error); if (vpl) { @@ -588,7 +588,7 @@ void sceKernelFreeVpl() SceUID id = PARAM(0); u32 blockPtr = PARAM(1); DEBUG_LOG(HLE,"sceKernelFreeVpl(%i, %08x)", id, blockPtr); - u32 error=0; + u32 error; VPL *vpl = kernelObjects.Get(id, error); if (vpl) { @@ -614,7 +614,7 @@ void sceKernelCancelVpl() void sceKernelReferVplStatus() { SceUID id = PARAM(0); - u32 error=0; + u32 error; VPL *v = kernelObjects.Get(id, error); if (v) { diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp index 46ecd8cf70..46305fe375 100644 --- a/Core/HLE/sceKernelModule.cpp +++ b/Core/HLE/sceKernelModule.cpp @@ -497,7 +497,7 @@ void __KernelStartModule(Module *m, int args, const char *argp, SceKernelSMOptio u32 __KernelGetModuleGP(SceUID uid) { - u32 error=0; + u32 error; Module *module = kernelObjects.Get(uid, error); if (module) { diff --git a/Core/HLE/sceKernelMsgPipe.cpp b/Core/HLE/sceKernelMsgPipe.cpp index be51e24fa7..1521d5f188 100644 --- a/Core/HLE/sceKernelMsgPipe.cpp +++ b/Core/HLE/sceKernelMsgPipe.cpp @@ -186,7 +186,7 @@ void sceKernelCreateMsgPipe() void sceKernelDeleteMsgPipe() { SceUID uid = PARAM(0); - u32 error=0; + u32 error; MsgPipe *m = kernelObjects.Get(uid, error); if (!m) { @@ -320,7 +320,7 @@ void sceKernelSendMsgPipe() u32 resultAddr = PARAM(4); u32 timeoutPtr = PARAM(5); - u32 error=0; + u32 error; MsgPipe *m = kernelObjects.Get(uid, error); if (!m) { ERROR_LOG(HLE, "sceKernelSendMsgPipe(%i) - ERROR %08x", uid, error); @@ -341,7 +341,7 @@ void sceKernelSendMsgPipeCB() u32 resultAddr = PARAM(4); u32 timeoutPtr = PARAM(5); - u32 error=0; + u32 error; MsgPipe *m = kernelObjects.Get(uid, error); if (!m) { ERROR_LOG(HLE, "sceKernelSendMsgPipeCB(%i) - ERROR %08x", uid, error); @@ -362,7 +362,7 @@ void sceKernelTrySendMsgPipe() int waitMode = PARAM(3); u32 resultAddr = PARAM(4); - u32 error=0; + u32 error; MsgPipe *m = kernelObjects.Get(uid, error); if (!m) { ERROR_LOG(HLE, "sceKernelTrySendMsgPipe(%i) - ERROR %08x", uid, error); @@ -496,7 +496,7 @@ void sceKernelReceiveMsgPipe() u32 resultAddr = PARAM(4); u32 timeoutPtr = PARAM(5); - u32 error=0; + u32 error; MsgPipe *m = kernelObjects.Get(uid, error); if (!m) { ERROR_LOG(HLE, "sceKernelReceiveMsgPipe(%i) - ERROR %08x", uid, error); @@ -517,7 +517,7 @@ void sceKernelReceiveMsgPipeCB() u32 resultAddr = PARAM(4); u32 timeoutPtr = PARAM(5); - u32 error=0; + u32 error; MsgPipe *m = kernelObjects.Get(uid, error); if (!m) { ERROR_LOG(HLE, "sceKernelReceiveMsgPipeCB(%i) - ERROR %08x", uid, error); @@ -537,7 +537,7 @@ void sceKernelTryReceiveMsgPipe() int waitMode = PARAM(3); u32 resultAddr = PARAM(4); - u32 error=0; + u32 error; MsgPipe *m = kernelObjects.Get(uid, error); if (!m) { ERROR_LOG(HLE, "sceKernelTryReceiveMsgPipe(%i) - ERROR %08x", uid, error); @@ -555,7 +555,7 @@ void sceKernelCancelMsgPipe() u32 numSendThreadsAddr = PARAM(1); u32 numReceiveThreadsAddr = PARAM(2); - u32 error=0; + u32 error; MsgPipe *m = kernelObjects.Get(uid, error); if (!m) { @@ -588,7 +588,7 @@ void sceKernelReferMsgPipeStatus() u32 msgPipeStatusAddr = PARAM(1); DEBUG_LOG(HLE,"sceKernelReferMsgPipeStatus(%i, %08x)", uid, msgPipeStatusAddr); - u32 error=0; + u32 error; MsgPipe *m = kernelObjects.Get(uid, error); if (m) { diff --git a/Core/HLE/sceKernelMutex.cpp b/Core/HLE/sceKernelMutex.cpp index 1a8f4b4a0e..e3d048e545 100644 --- a/Core/HLE/sceKernelMutex.cpp +++ b/Core/HLE/sceKernelMutex.cpp @@ -256,7 +256,7 @@ bool __KernelUnlockMutexForThread(Mutex *mutex, SceUID threadID, u32 &error, int int sceKernelDeleteMutex(SceUID id) { DEBUG_LOG(HLE,"sceKernelDeleteMutex(%i)", id); - u32 error=0; + u32 error; Mutex *mutex = kernelObjects.Get(id, error); if (mutex) { @@ -409,7 +409,7 @@ void __KernelWaitMutex(Mutex *mutex, u32 timeoutPtr) int sceKernelLockMutex(SceUID id, int count, u32 timeoutPtr) { DEBUG_LOG(HLE, "sceKernelLockMutex(%i, %i, %08x)", id, count, timeoutPtr); - u32 error=0; + u32 error; Mutex *mutex = kernelObjects.Get(id, error); if (__KernelLockMutex(mutex, count, error)) @@ -431,7 +431,7 @@ int sceKernelLockMutex(SceUID id, int count, u32 timeoutPtr) int sceKernelLockMutexCB(SceUID id, int count, u32 timeoutPtr) { DEBUG_LOG(HLE, "sceKernelLockMutexCB(%i, %i, %08x)", id, count, timeoutPtr); - u32 error=0; + u32 error; Mutex *mutex = kernelObjects.Get(id, error); if (__KernelLockMutex(mutex, count, error)) @@ -456,7 +456,7 @@ int sceKernelLockMutexCB(SceUID id, int count, u32 timeoutPtr) int sceKernelTryLockMutex(SceUID id, int count) { DEBUG_LOG(HLE, "sceKernelTryLockMutex(%i, %i)", id, count); - u32 error=0; + u32 error; Mutex *mutex = kernelObjects.Get(id, error); if (__KernelLockMutex(mutex, count, error)) @@ -471,7 +471,7 @@ int sceKernelTryLockMutex(SceUID id, int count) int sceKernelUnlockMutex(SceUID id, int count) { DEBUG_LOG(HLE, "sceKernelUnlockMutex(%i, %i)", id, count); - u32 error=0; + u32 error; Mutex *mutex = kernelObjects.Get(id, error); if (error) @@ -581,7 +581,7 @@ int sceKernelDeleteLwMutex(u32 workareaPtr) NativeLwMutexWorkarea workarea; Memory::ReadStruct(workareaPtr, &workarea); - u32 error=0; + u32 error; LwMutex *mutex = kernelObjects.Get(workarea.uid, error); if (mutex) {