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

Fix some printf size warnings, signed warnings.

Browse source
This commit is contained in:
Unknown W. Brackets 2013-03-02 13:50:38 -08:00
parent e87276cbad
commit a3f93ed203
8 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Core/Font/PGF.cpp
View file

@ -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);

4
Core/HLE/sceFont.cpp
View file

@ -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;
}

2
Core/HLE/sceIo.cpp
View file

@ -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);

12
Core/HLE/sceKernelVTimer.cpp
View file

@ -253,7 +253,7 @@ u32 sceKernelGetVTimerTime(u32 uid, u32 timeClockAddr) {
VTimer *vt = kernelObjects.Get<VTimer>(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<VTimer>(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<VTimer>(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<VTimer>(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<VTimer>(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<VTimer>(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;
}

6
Core/HLE/sceUmd.cpp
View file

@ -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>,"sceUmdGetErrorStat"},
{0x340B7686,WrapU_U<sceUmdGetDiscInfo>,"sceUmdGetDiscInfo"},
{0xAEE7404D,&WrapU_U<sceUmdRegisterUMDCallBack>,"sceUmdRegisterUMDCallBack"},
{0xBD2BDE07,&WrapU_U<sceUmdUnRegisterUMDCallBack>,"sceUmdUnRegisterUMDCallBack"},
{0xBD2BDE07,&WrapI_I<sceUmdUnRegisterUMDCallBack>,"sceUmdUnRegisterUMDCallBack"},
{0x87533940,WrapU_V<sceUmdReplaceProhibit>,"sceUmdReplaceProhibit"},
{0x87533940,WrapU_V<sceUmdReplacePermit>,"sceUmdReplacePermit"},
};

1
Core/MIPS/MIPSIntVFPU.cpp
View file

@ -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);

2
Core/Util/PPGeDraw.cpp
View file

@ -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;
}

4
android/jni/MenuScreens.cpp
View file

@ -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();