diff --git a/Common/LogManager.cpp b/Common/LogManager.cpp index 64da7ff032..62174d3d31 100644 --- a/Common/LogManager.cpp +++ b/Common/LogManager.cpp @@ -159,7 +159,7 @@ void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const static const char level_to_char[7] = "-NEWID"; char formattedTime[13]; Common::Timer::GetTimeFormatted(formattedTime); - sprintf(msg, "%s %s:%u %c[%s]: %s\n", + sprintf(msg, "%s %s:%d %c[%s]: %s\n", formattedTime, file, line, level_to_char[(int)level], log->GetShortName(), temp); diff --git a/Core/HLE/sceKernelMbx.cpp b/Core/HLE/sceKernelMbx.cpp index ae0cab10cd..5eebea0387 100644 --- a/Core/HLE/sceKernelMbx.cpp +++ b/Core/HLE/sceKernelMbx.cpp @@ -410,7 +410,7 @@ int sceKernelSendMbx(SceUID id, u32 packetAddr) int sceKernelReceiveMbx(SceUID id, u32 packetAddrPtr, u32 timeoutPtr) { - u32 error; + u32 error=0; 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; + u32 error=0; 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; + u32 error=0; 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; + u32 error=0; 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; + u32 error=0; Mbx *m = kernelObjects.Get(id, error); if (!m) { diff --git a/Core/HLE/sceKernelMemory.cpp b/Core/HLE/sceKernelMemory.cpp index 5513850417..edd94ddb7c 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; + u32 error=0; FPL *fpl = kernelObjects.Get(id, error); if (fpl) { @@ -184,7 +184,7 @@ void sceKernelDeleteFpl() void sceKernelAllocateFpl() { SceUID id = PARAM(0); - u32 error; + u32 error=0; FPL *fpl = kernelObjects.Get(id, error); if (fpl) { @@ -214,7 +214,7 @@ void sceKernelAllocateFpl() void sceKernelAllocateFplCB() { SceUID id = PARAM(0); - u32 error; + u32 error=0; FPL *fpl = kernelObjects.Get(id, error); if (fpl) { @@ -243,7 +243,7 @@ void sceKernelAllocateFplCB() void sceKernelTryAllocateFpl() { SceUID id = PARAM(0); - u32 error; + u32 error=0; 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; + u32 error=0; 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; + u32 error=0; 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; + u32 error=0; FPL *fpl = kernelObjects.Get(id, error); if (fpl) { @@ -415,7 +415,7 @@ void sceKernelGetBlockHeadAddr() { SceUID id = PARAM(0); - u32 error; + u32 error=0; 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; + u32 error=0; VPL *vpl = kernelObjects.Get(id, error); if (vpl) { @@ -498,7 +498,7 @@ void sceKernelAllocateVpl() { SceUID id = PARAM(0); DEBUG_LOG(HLE,"sceKernelAllocateVpl()"); - u32 error; + u32 error=0; VPL *vpl = kernelObjects.Get(id, error); if (vpl) { @@ -527,7 +527,7 @@ void sceKernelAllocateVpl() void sceKernelAllocateVplCB() { SceUID id = PARAM(0); - u32 error; + u32 error=0; VPL *vpl = kernelObjects.Get(id, error); if (vpl) { @@ -557,7 +557,7 @@ void sceKernelAllocateVplCB() void sceKernelTryAllocateVpl() { SceUID id = PARAM(0); - u32 error; + u32 error=0; 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; + u32 error=0; VPL *vpl = kernelObjects.Get(id, error); if (vpl) { @@ -614,7 +614,7 @@ void sceKernelCancelVpl() void sceKernelReferVplStatus() { SceUID id = PARAM(0); - u32 error; + u32 error=0; VPL *v = kernelObjects.Get(id, error); if (v) { diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp index 46305fe375..46ecd8cf70 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; + u32 error=0; Module *module = kernelObjects.Get(uid, error); if (module) { diff --git a/Core/HLE/sceKernelMutex.cpp b/Core/HLE/sceKernelMutex.cpp index e3d048e545..1a8f4b4a0e 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; + u32 error=0; 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; + u32 error=0; 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; + u32 error=0; 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; + u32 error=0; 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; + u32 error=0; Mutex *mutex = kernelObjects.Get(id, error); if (error) @@ -581,7 +581,7 @@ int sceKernelDeleteLwMutex(u32 workareaPtr) NativeLwMutexWorkarea workarea; Memory::ReadStruct(workareaPtr, &workarea); - u32 error; + u32 error=0; LwMutex *mutex = kernelObjects.Get(workarea.uid, error); if (mutex) {