diff --git a/Core/Dialog/PSPGamedataInstallDialog.cpp b/Core/Dialog/PSPGamedataInstallDialog.cpp index 2f5b3208d7..1ade5dc3cb 100644 --- a/Core/Dialog/PSPGamedataInstallDialog.cpp +++ b/Core/Dialog/PSPGamedataInstallDialog.cpp @@ -26,7 +26,6 @@ namespace std::vector GetPSPFileList (std::string dirpath) { std::vector FileList; auto Fileinfos = pspFileSystem.GetDirListing(dirpath); - std::string info; for (auto it = Fileinfos.begin(); it != Fileinfos.end(); ++it) { std::string info = (*it).name; diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp index 72c97f0b2e..eeb7271cd1 100755 --- a/Core/Dialog/PSPOskDialog.cpp +++ b/Core/Dialog/PSPOskDialog.cpp @@ -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; } } } diff --git a/Core/HLE/sceHttp.cpp b/Core/HLE/sceHttp.cpp index c188f16c93..9b58d96bea 100644 --- a/Core/HLE/sceHttp.cpp +++ b/Core/HLE/sceHttp.cpp @@ -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; } diff --git a/Core/HLE/sceKernelMsgPipe.cpp b/Core/HLE/sceKernelMsgPipe.cpp index 6a75df6815..30eee3ab98 100644 --- a/Core/HLE/sceKernelMsgPipe.cpp +++ b/Core/HLE/sceKernelMsgPipe.cpp @@ -717,9 +717,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; diff --git a/Core/Reporting.cpp b/Core/Reporting.cpp index 5f29aa68e7..19b9ed1fe9 100644 --- a/Core/Reporting.cpp +++ b/Core/Reporting.cpp @@ -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".) diff --git a/GPU/GLES/Spline.cpp b/GPU/GLES/Spline.cpp index ecd303e0e0..f4fa5238be 100644 --- a/GPU/GLES/Spline.cpp +++ b/GPU/GLES/Spline.cpp @@ -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;