Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4045 from unknownbrackets/warnings

Browse source 
Warning fixes
This commit is contained in:
Henrik Rydgård 2013-10-05 13:31:34 -07:00
commit fec5110dfc
11 changed files with 34 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Core/Dialog/PSPGamedataInstallDialog.cpp
View file

@ -26,7 +26,6 @@ namespace
std::vector<std::string> GetPSPFileList (std::string dirpath) {
std::vector<std::string> FileList;
auto Fileinfos = pspFileSystem.GetDirListing(dirpath);
std::string info;
for (auto it = Fileinfos.begin(); it != Fileinfos.end(); ++it) {
std::string info = (*it).name;

12
Core/Dialog/PSPOskDialog.cpp
View file

@ -381,14 +381,14 @@ std::wstring PSPOskDialog::CombinationKorean(bool isInput)
}
}
} else {
int tmp = GetIndex(kor_lcons, sw);
int tmp2 = GetIndex(kor_lcons, sw);
if(tmp == -1) {
if (tmp2 == -1) {
string += inputChars[i];
if (inputChars.size() < FieldMaxLength()) {
string += sw;
if(isInput == true) {
if (isInput == true) {
i_value[0] = GetIndex(kor_cons, sw);
if(i_value[0] != -1)
@ -400,13 +400,13 @@ std::wstring PSPOskDialog::CombinationKorean(bool isInput)
isCombinated = false;
}
} else {
u16 code = 0xAC00 + i_value[0] * 0x24C + i_value[1] * 0x1C + tmp + 1;
u16 code = 0xAC00 + i_value[0] * 0x24C + i_value[1] * 0x1C + tmp2 + 1;
string += code;
if(isInput == true) {
if (isInput == true) {
i_level = 3;
i_value[2] = tmp;
i_value[2] = tmp2;
}
}
}

2
Core/HLE/__sceAudio.cpp
View file

@ -290,7 +290,7 @@ void __AudioUpdate() {
continue;
}
if (hwBlockSize * 2 > chans[i].sampleQueue.size()) {
if (hwBlockSize * 2 > (int)chans[i].sampleQueue.size()) {
ERROR_LOG(SCEAUDIO, "Channel %i buffer underrun at %i of %i", i, (int)chans[i].sampleQueue.size() / 2, hwBlockSize);
}

4
Core/HLE/sceAtrac.cpp
View file

@ -728,7 +728,7 @@ u32 sceAtracDecodeData(int atracID, u32 outAddr, u32 numSamplesAddr, u32 finishF
u32 finish = 0;
int remains = 0;
int ret = _AtracDecodeData(atracID, Memory::GetPointer(outAddr), &numSamples, &finish, &remains);
if (ret != ATRAC_ERROR_BAD_ATRACID) {
if (ret != (int)ATRAC_ERROR_BAD_ATRACID) {
Memory::Write_U32(numSamples, numSamplesAddr);
Memory::Write_U32(finish, finishFlagAddr);
Memory::Write_U32(remains, remainAddr);
@ -1230,7 +1230,7 @@ u32 sceAtracSetData(int atracID, u32 buffer, u32 bufferSize)
atrac->first.addr = buffer;
atrac->first.size = bufferSize;
int ret = atrac->Analyze();
if (ret == 0 && atrac->codecType != atracIDTypes[atracID]) {
if (ret == 0 && (int)atrac->codecType != atracIDTypes[atracID]) {
ERROR_LOG(ME, "sceAtracSetData(%i, %08x, %08x): atracID uses different codec type than data", atracID, buffer, bufferSize);
ret = ATRAC_ERROR_WRONG_CODECTYPE;
}

2
Core/HLE/sceGe.cpp
View file

@ -583,7 +583,7 @@ int sceGeGetMtx(int type, u32 matrixPtr) {
u32 sceGeGetCmd(int cmd) {
INFO_LOG(SCEGE, "sceGeGetCmd(%i)", cmd);
if (cmd >= 0 && cmd < ARRAY_SIZE(gstate.cmdmem)) {
if (cmd >= 0 && cmd < (int)ARRAY_SIZE(gstate.cmdmem)) {
return gstate.cmdmem[cmd]; // Does not mask away the high bits.
} else {
return SCE_KERNEL_ERROR_INVALID_INDEX;

4
Core/HLE/sceHttp.cpp
View file

@ -165,8 +165,8 @@ int sceHttpCreateRequest(int connectionID, int method, const char *path, u64 con
return 0;
}
int sceHttpCreateConnection(int templateID, const char *host, const char *unknown1, u32 port, int unknown2) {
ERROR_LOG(SCENET, "UNIMPL sceHttpCreateConnection(%d, %s, %s, %d, %d)", templateID, host, unknown1, port, unknown2);
int sceHttpCreateConnection(int templateID, const char *hostString, const char *unknown1, u32 port, int unknown2) {
ERROR_LOG(SCENET, "UNIMPL sceHttpCreateConnection(%d, %s, %s, %d, %d)", templateID, hostString, unknown1, port, unknown2);
return 0;
}

12
Core/HLE/sceKernelMsgPipe.cpp
View file

@ -610,6 +610,12 @@ void __KernelMsgPipeEndCallback(SceUID threadID, SceUID prevCallbackId)
SceUID uid = __KernelGetWaitID(threadID, WAITTYPE_MSGPIPE, error);
MsgPipe *ko = uid == 0 ? NULL : kernelObjects.Get<MsgPipe>(uid, error);
if (ko == NULL)
{
ERROR_LOG_REPORT(SCEKERNEL, "__KernelMsgPipeEndCallback: Invalid object");
return;
}
switch (waitValue)
{
case MSGPIPE_WAIT_VALUE_SEND:
@ -717,9 +723,9 @@ int sceKernelCreateMsgPipe(const char *name, int partition, u32 attr, u32 size,
if (optionsPtr != 0)
{
u32 size = Memory::Read_U32(optionsPtr);
if (size > 4)
WARN_LOG_REPORT(SCEKERNEL, "sceKernelCreateMsgPipe(%s) unsupported options parameter, size = %d", name, size);
u32 optionsSize = Memory::Read_U32(optionsPtr);
if (optionsSize > 4)
WARN_LOG_REPORT(SCEKERNEL, "sceKernelCreateMsgPipe(%s) unsupported options parameter, size = %d", name, optionsSize);
}
return id;

2
Core/MIPS/ARM/ArmCompBranch.cpp
View file

@ -284,7 +284,7 @@ void Jit::BranchVFPUFlag(MIPSOpcode op, ArmGen::CCFlags cc, bool likely)
CONDITIONAL_NICE_DELAYSLOT;
if (!likely && delaySlotIsNice)
CompileDelaySlot(DELAYSLOT_NICE);
if (delaySlotIsBranch && (delaySlotOp & 0xFFFF) != (signed short)(op & 0xFFFF) - 1)
if (delaySlotIsBranch && (signed short)(delaySlotOp & 0xFFFF) != (signed short)(op & 0xFFFF) - 1)
ERROR_LOG_REPORT(JIT, "VFPU branch in VFPU delay slot at %08x with different target", js.compilerPC);
int imm3 = (op >> 18) & 7;

10
Core/Reporting.cpp
View file

@ -76,16 +76,16 @@ namespace Reporting
return g_Config.sReportHost.npos;
// IPv6 literal?
std::string host = ServerHost();
if (host[0] == '[')
std::string hostString = ServerHost();
if (hostString[0] == '[')
{
size_t length = host.find("]:");
if (length != host.npos)
size_t length = hostString.find("]:");
if (length != hostString.npos)
++length;
return length;
}
else
return host.find(':');
return hostString.find(':');
}
// Returns only the hostname part (e.g. "report.ppsspp.org".)

2
Core/System.cpp
View file

@ -346,7 +346,7 @@ void GetSysDirectories(std::string &memstickpath, std::string &flash0path) {
char memstickpath_buf[_MAX_PATH];
char flash0path_buf[_MAX_PATH];
GetModuleFileName(NULL, path_buffer, sizeof(path_buffer));
GetModuleFileName(NULL, path_buffer, ARRAY_SIZE(path_buffer));
std::string path = ConvertWStringToUTF8(path_buffer);

12
GPU/GLES/Spline.cpp
View file

@ -83,15 +83,15 @@ u32 TransformDrawEngine::NormalizeVertices(u8 *outPtr, u8 *bufPtr, const u8 *inP
// Skinning
Vec3f psum(0,0,0);
Vec3f nsum(0,0,0);
for (int i = 0; i < numBoneWeights; i++) {
if (weights[i] != 0.0f) {
Vec3ByMatrix43(bpos, pos, gstate.boneMatrix+i*12);
for (int w = 0; w < numBoneWeights; w++) {
if (weights[w] != 0.0f) {
Vec3ByMatrix43(bpos, pos, gstate.boneMatrix+w*12);
Vec3f tpos(bpos);
psum += tpos * weights[i];
psum += tpos * weights[w];
Norm3ByMatrix43(bnrm, nrm, gstate.boneMatrix+i*12);
Norm3ByMatrix43(bnrm, nrm, gstate.boneMatrix+w*12);
Vec3f tnorm(bnrm);
nsum += tnorm * weights[i];
nsum += tnorm * weights[w];
}
}
sv.pos = psum;