From a3f93ed203bb021496ff9fd08eddb38a3351f497 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 2 Mar 2013 13:50:38 -0800 Subject: [PATCH] Fix some printf size warnings, signed warnings. --- Core/Font/PGF.cpp | 2 +- Core/HLE/sceFont.cpp | 4 ++-- Core/HLE/sceIo.cpp | 2 +- Core/HLE/sceKernelVTimer.cpp | 12 ++++++------ Core/HLE/sceUmd.cpp | 6 +++--- Core/MIPS/MIPSIntVFPU.cpp | 1 + Core/Util/PPGeDraw.cpp | 2 +- android/jni/MenuScreens.cpp | 4 ++-- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Core/Font/PGF.cpp b/Core/Font/PGF.cpp index b0b4437818..635d1021f0 100644 --- a/Core/Font/PGF.cpp +++ b/Core/Font/PGF.cpp @@ -68,7 +68,7 @@ void PGF::DoState(PointerWrap &p) { void PGF::ReadPtr(const u8 *ptr, size_t dataSize) { const u8 *const startPtr = ptr; - INFO_LOG(HLE, "Reading %d bytes of PGF header", sizeof(header)); + INFO_LOG(HLE, "Reading %d bytes of PGF header", (int)sizeof(header)); memcpy(&header, ptr, sizeof(header)); ptr += sizeof(header); diff --git a/Core/HLE/sceFont.cpp b/Core/HLE/sceFont.cpp index 7125478ba8..8afcdee819 100644 --- a/Core/HLE/sceFont.cpp +++ b/Core/HLE/sceFont.cpp @@ -158,7 +158,7 @@ private: class LoadedFont { public: LoadedFont(Font *font, FontLib *fontLib, u32 handle) - : font_(font), fontLib_(fontLib), handle_(handle) {} + : fontLib_(fontLib), font_(font), handle_(handle) {} Font *GetFont() { return font_; } FontLib *GetFontLib() { return fontLib_; } @@ -501,7 +501,7 @@ u32 sceFontOpen(u32 libHandle, u32 index, u32 mode, u32 errorCodePtr) { } FontLib *fontLib = GetFontLib(libHandle); - if (index < 0 || index >= internalFonts.size()) { + if (index >= internalFonts.size()) { Memory::Write_U32(ERROR_FONT_INVALID_PARAMETER, errorCodePtr); return 0; } diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp index d1003f5db1..45d71596a6 100644 --- a/Core/HLE/sceIo.cpp +++ b/Core/HLE/sceIo.cpp @@ -270,7 +270,7 @@ u32 sceIoAssign(u32 alias_addr, u32 physical_addr, u32 filesystem_addr, int mode perm = "IOASSIGN_RDONLY"; break; default: - perm = "unhandled " + mode; + perm = "unhandled"; break; } DEBUG_LOG(HLE, "sceIoAssign(%s, %s, %s, %s, %08x, %i)", alias.c_str(), physical_dev.c_str(), filesystem_dev.c_str(), perm.c_str(), arg_addr, argSize); diff --git a/Core/HLE/sceKernelVTimer.cpp b/Core/HLE/sceKernelVTimer.cpp index eedd35e5fb..0f7e24f34c 100644 --- a/Core/HLE/sceKernelVTimer.cpp +++ b/Core/HLE/sceKernelVTimer.cpp @@ -253,7 +253,7 @@ u32 sceKernelGetVTimerTime(u32 uid, u32 timeClockAddr) { VTimer *vt = kernelObjects.Get(uid, error); if (error) { - WARN_LOG(HLE, "%08x=sceKernelGetVTimerTime(%08x, %08x)", uid, timeClockAddr); + WARN_LOG(HLE, "%08x=sceKernelGetVTimerTime(%08x, %08x)", error, uid, timeClockAddr); return error; } @@ -290,7 +290,7 @@ u32 sceKernelSetVTimerTime(u32 uid, u32 timeClockAddr) { VTimer *vt = kernelObjects.Get(uid, error); if (error) { - WARN_LOG(HLE, "%08x=sceKernelSetVTimerTime(%08x, %08x)", uid, timeClockAddr); + WARN_LOG(HLE, "%08x=sceKernelSetVTimerTime(%08x, %08x)", error, uid, timeClockAddr); return error; } @@ -307,7 +307,7 @@ u32 sceKernelSetVTimerTimeWide(u32 uid, u64 timeClock) { VTimer *vt = kernelObjects.Get(uid, error); if (error) { - WARN_LOG(HLE, "%08x=sceKernelSetVTimerTimeWide(%08x, %llu)", uid, timeClock); + WARN_LOG(HLE, "%08x=sceKernelSetVTimerTimeWide(%08x, %llu)", error, uid, timeClock); return error; } @@ -369,7 +369,7 @@ u32 sceKernelSetVTimerHandler(u32 uid, u32 scheduleAddr, u32 handlerFuncAddr, u3 VTimer *vt = kernelObjects.Get(uid, error); if (error) { - WARN_LOG(HLE, "%08x=sceKernelSetVTimerHandler(%08x, %08x, %08x, %08x)", uid, scheduleAddr, handlerFuncAddr, commonAddr); + WARN_LOG(HLE, "%08x=sceKernelSetVTimerHandler(%08x, %08x, %08x, %08x)", error, uid, scheduleAddr, handlerFuncAddr, commonAddr); return error; } @@ -389,7 +389,7 @@ u32 sceKernelSetVTimerHandlerWide(u32 uid, u64 schedule, u32 handlerFuncAddr, u3 VTimer *vt = kernelObjects.Get(uid, error); if (error) { - WARN_LOG(HLE, "%08x=sceKernelSetVTimerHandlerWide(%08x, %llu, %08x, %08x)", uid, schedule, handlerFuncAddr, commonAddr); + WARN_LOG(HLE, "%08x=sceKernelSetVTimerHandlerWide(%08x, %llu, %08x, %08x)", error, uid, schedule, handlerFuncAddr, commonAddr); return error; } @@ -417,7 +417,7 @@ u32 sceKernelReferVTimerStatus(u32 uid, u32 statusAddr) { VTimer *vt = kernelObjects.Get(uid, error); if (error) { - WARN_LOG(HLE, "%08x=sceKernelReferVTimerStatus(%08x, %08x)", uid, statusAddr); + WARN_LOG(HLE, "%08x=sceKernelReferVTimerStatus(%08x, %08x)", error, uid, statusAddr); return error; } diff --git a/Core/HLE/sceUmd.cpp b/Core/HLE/sceUmd.cpp index 222fc8bb66..b54947382d 100644 --- a/Core/HLE/sceUmd.cpp +++ b/Core/HLE/sceUmd.cpp @@ -236,9 +236,9 @@ u32 sceUmdRegisterUMDCallBack(u32 cbId) return retVal; } -u32 sceUmdUnRegisterUMDCallBack(u32 cbId) +int sceUmdUnRegisterUMDCallBack(int cbId) { - u32 retVal; + int retVal; if (cbId != driveCBId) retVal = PSP_ERROR_UMD_INVALID_PARAM; @@ -387,7 +387,7 @@ const HLEFunction sceUmdUser[] = {0x20628E6F,&WrapU_V,"sceUmdGetErrorStat"}, {0x340B7686,WrapU_U,"sceUmdGetDiscInfo"}, {0xAEE7404D,&WrapU_U,"sceUmdRegisterUMDCallBack"}, - {0xBD2BDE07,&WrapU_U,"sceUmdUnRegisterUMDCallBack"}, + {0xBD2BDE07,&WrapI_I,"sceUmdUnRegisterUMDCallBack"}, {0x87533940,WrapU_V,"sceUmdReplaceProhibit"}, {0x87533940,WrapU_V,"sceUmdReplacePermit"}, }; diff --git a/Core/MIPS/MIPSIntVFPU.cpp b/Core/MIPS/MIPSIntVFPU.cpp index 3e80912b1c..b65cfcb4eb 100644 --- a/Core/MIPS/MIPSIntVFPU.cpp +++ b/Core/MIPS/MIPSIntVFPU.cpp @@ -926,6 +926,7 @@ namespace MIPSInt break; default: _dbg_assert_msg_(CPU,0,"Trying to interpret instruction that can't be interpreted"); + oz = V_Single; break; } ApplyPrefixD((float*)d,oz); diff --git a/Core/Util/PPGeDraw.cpp b/Core/Util/PPGeDraw.cpp index 4a77375ac2..fe84cd7134 100644 --- a/Core/Util/PPGeDraw.cpp +++ b/Core/Util/PPGeDraw.cpp @@ -100,7 +100,7 @@ static void EndVertexDataAndDraw(int prim) { static u32 __PPGeDoAlloc(u32 &size, bool fromTop, const char *name) { u32 ptr = kernelMemory.Alloc(size, fromTop, name); // Didn't get it. - if (ptr == -1) + if (ptr == (u32)-1) return 0; return ptr; } diff --git a/android/jni/MenuScreens.cpp b/android/jni/MenuScreens.cpp index 2a5ce024bb..808be54ede 100644 --- a/android/jni/MenuScreens.cpp +++ b/android/jni/MenuScreens.cpp @@ -444,7 +444,7 @@ void CreditsScreen::update(InputState &input_state) { frames_++; } -static char *credits[] = +const static char *credits[] = { "PPSSPP", "", @@ -509,7 +509,7 @@ void CreditsScreen::render() { // TODO: This is kinda ugly, done on every frame... char temp[256]; snprintf(temp, 256, "PPSSPP %s", PPSSPP_GIT_VERSION); - credits[0] = temp; + credits[0] = (const char *)temp; UIShader_Prepare(); UIBegin();