mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-01 14:58:14 +00:00
Assorted warning fixes
This commit is contained in:
1 parent
4d98ff8404
commit
55eee26c52
5 files changed
+4
-12
No files matched your search
@@ -267,7 +267,7 @@ static int sceAudiocodecDecode(u32 ctxPtr, int codec) {
|
||||
ctx->srcBytesRead = inDataConsumed;
|
||||
ctx->dstSamplesWritten = outSamples;
|
||||
}
|
||||
return hleLogDebug(Log::ME, 0, "codec %s", GetCodecName(codec));
|
||||
return hleLogDebug(Log::ME, 0, "codec %s sampleRate: %d bytesPerFrame: %d channels: %d", GetCodecName(codec), sampleRate, bytesPerFrame, channels);
|
||||
}
|
||||
|
||||
// This is used by sceMp3, in Beats.
|
||||
|
||||
@@ -1036,7 +1036,7 @@ void Register_ThreadManForKernel()
|
||||
const char *KernelErrorToString(u32 err) {
|
||||
switch (err) {
|
||||
case 0x00000000: return "ERROR_OK";
|
||||
case SCE_KERNEL_ERROR_BAD_ARGUMENT: "BAD_ARGUMENT";
|
||||
case SCE_KERNEL_ERROR_BAD_ARGUMENT: return "BAD_ARGUMENT";
|
||||
case 0x80000020: return "ALREADY";
|
||||
case 0x80000021: return "BUSY";
|
||||
case 0x80000022: return "OUT_OF_MEMORY";
|
||||
|
||||
@@ -90,7 +90,7 @@ public:
|
||||
|
||||
// Extracts the contents of an open zip archive into dest. Exposed for testing.
|
||||
// maxTotalSize limits the total decompressed size (zip bomb protection).
|
||||
bool ExtractZipContents(struct zip *z, const Path &dest, const ZipFileInfo &info, bool allowRoot, size_t maxTotalSize = 0x100000000);
|
||||
bool ExtractZipContents(struct zip *z, const Path &dest, const ZipFileInfo &info, bool allowRoot, size_t maxTotalSize = 0x100000000ULL);
|
||||
|
||||
private:
|
||||
void InstallZipContents(ZipFileTask task);
|
||||
@@ -100,7 +100,7 @@ private:
|
||||
|
||||
void InstallDone();
|
||||
|
||||
bool ExtractFile(struct zip *z, int file_index, const Path &outFilename, size_t *bytesCopied, size_t allBytes, size_t maxTotalSize = 0x100000000);
|
||||
bool ExtractFile(struct zip *z, int file_index, const Path &outFilename, size_t *bytesCopied, size_t allBytes, size_t maxTotalSize = 0x100000000ULL);
|
||||
bool DetectTexturePackDest(struct zip *z, int iniIndex, Path &dest);
|
||||
void SetInstallError(std::string_view err);
|
||||
|
||||
|
||||
@@ -143,7 +143,6 @@ void InstallZipScreen::CreateContentViews(UI::ViewGroup *parent) {
|
||||
|
||||
std::string shortFilename = zipPath_.GetFilename();
|
||||
|
||||
bool showDeleteCheckbox = false;
|
||||
returnToHomebrew_ = false;
|
||||
installChoice_ = nullptr;
|
||||
playChoice_ = nullptr;
|
||||
@@ -186,7 +185,6 @@ void InstallZipScreen::CreateContentViews(UI::ViewGroup *parent) {
|
||||
}
|
||||
|
||||
returnToHomebrew_ = true;
|
||||
showDeleteCheckbox = true;
|
||||
break;
|
||||
}
|
||||
case ZipFileContents::TEXTURE_PACK:
|
||||
@@ -195,7 +193,6 @@ void InstallZipScreen::CreateContentViews(UI::ViewGroup *parent) {
|
||||
leftColumn->Add(new TextView(question));
|
||||
leftColumn->Add(new TextView(shortFilename));
|
||||
|
||||
showDeleteCheckbox = true;
|
||||
break;
|
||||
}
|
||||
case ZipFileContents::PRX_PLUGIN:
|
||||
@@ -241,7 +238,6 @@ void InstallZipScreen::CreateContentViews(UI::ViewGroup *parent) {
|
||||
destFolders_.push_back(savestateDir);
|
||||
|
||||
// TODO: Use the GameInfoCache to display data about the game if available.
|
||||
showDeleteCheckbox = true;
|
||||
break;
|
||||
}
|
||||
case ZipFileContents::SAVE_DATA:
|
||||
@@ -282,7 +278,6 @@ void InstallZipScreen::CreateContentViews(UI::ViewGroup *parent) {
|
||||
}
|
||||
}
|
||||
|
||||
showDeleteCheckbox = true;
|
||||
break;
|
||||
}
|
||||
case ZipFileContents::FRAME_DUMP:
|
||||
|
||||
@@ -578,9 +578,7 @@ void NativeInit(int argc, const char *argv[], const CommandLineOptions &cmdLineO
|
||||
// Apply parsed command line options to config.
|
||||
cmdLineOptions.ApplyToConfig();
|
||||
|
||||
bool gotBootFilename = false;
|
||||
boot_filename.clear();
|
||||
|
||||
if (boot_filename.empty() && cmdLineOptions.bootVSH.has_value() && cmdLineOptions.bootVSH.value()) {
|
||||
boot_filename = g_Config.flash0Directory / "vsh/module/vshmain.prx";
|
||||
}
|
||||
@@ -629,7 +627,6 @@ void NativeInit(int argc, const char *argv[], const CommandLineOptions &cmdLineO
|
||||
// don't already have one.
|
||||
if (!cmdLineOptions.bootFilenames.empty()) {
|
||||
std::string bootFilename = cmdLineOptions.bootFilenames[0];
|
||||
gotBootFilename = true;
|
||||
INFO_LOG(Log::System, "Boot filename found in args: '%s'", bootFilename.c_str());
|
||||
|
||||
bool okToLoad = true;
|
||||
|
||||
Reference in new issue
Block a user