From 7f27cfc9d20cfe9939f2d5810d2b26fe8d5926f1 Mon Sep 17 00:00:00 2001 From: magumagu9 Date: Sun, 28 Jun 2009 20:53:26 +0000 Subject: [PATCH] Misc warning fixes. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3583 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/MathUtil.cpp | 2 +- Source/Core/Common/Src/SDCardUtil.cpp | 1 - Source/Core/Common/Src/StringUtil.cpp | 6 +++--- Source/Core/Common/Src/x64Emitter.cpp | 2 -- Source/Core/Core/Src/Boot/Boot.cpp | 1 - Source/Core/Core/Src/Boot/Boot_BIOSEmu.cpp | 8 ++++---- Source/Core/Core/Src/Core.cpp | 4 +--- Source/Core/InputCommon/Src/EventHandler.cpp | 12 ++++-------- 8 files changed, 13 insertions(+), 23 deletions(-) diff --git a/Source/Core/Common/Src/MathUtil.cpp b/Source/Core/Common/Src/MathUtil.cpp index c30d3b6306..efa9b922e4 100644 --- a/Source/Core/Common/Src/MathUtil.cpp +++ b/Source/Core/Common/Src/MathUtil.cpp @@ -165,7 +165,7 @@ inline void MatrixMul(int n, const float *a, const float *b, float *result) float MathFloatVectorSum(std::vector Vec) { float Sum = 0.0; - for(int i = 0; i < Vec.size(); i++) + for(unsigned i = 0; i < Vec.size(); i++) { Sum += Vec.at(i); } diff --git a/Source/Core/Common/Src/SDCardUtil.cpp b/Source/Core/Common/Src/SDCardUtil.cpp index 3002b89db7..51a4639c06 100644 --- a/Source/Core/Common/Src/SDCardUtil.cpp +++ b/Source/Core/Common/Src/SDCardUtil.cpp @@ -51,7 +51,6 @@ static u8 s_boot_sector [ BYTES_PER_SECTOR ]; /* boot sector */ static u8 s_fsinfo_sector [ BYTES_PER_SECTOR ]; /* FS Info sector */ static u8 s_fat_head [ BYTES_PER_SECTOR ]; /* first FAT sector */ -static u8 s_zero_sector [ BYTES_PER_SECTOR ]; /* empty sector */ /* this is the date and time when creating the disk */ static int get_serial_id() diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp index b7cb1adb1c..7cfe8f3c15 100644 --- a/Source/Core/Common/Src/StringUtil.cpp +++ b/Source/Core/Common/Src/StringUtil.cpp @@ -466,7 +466,7 @@ std::string TabsToSpaces(int tab_size, const std::string &in) std::string out; int len = 0; // First, compute the size of the new string. - for (int i = 0; i < in.size(); i++) + for (unsigned i = 0; i < in.size(); i++) { if (in[i] == '\t') len += tab_size; @@ -475,7 +475,7 @@ std::string TabsToSpaces(int tab_size, const std::string &in) } out.resize(len); int out_ctr = 0; - for (int i = 0; i < in.size(); i++) + for (unsigned i = 0; i < in.size(); i++) { if (in[i] == '\t') { @@ -488,4 +488,4 @@ std::string TabsToSpaces(int tab_size, const std::string &in) } } return out; -} \ No newline at end of file +} diff --git a/Source/Core/Common/Src/x64Emitter.cpp b/Source/Core/Common/Src/x64Emitter.cpp index 768fae5451..426e1f5332 100644 --- a/Source/Core/Common/Src/x64Emitter.cpp +++ b/Source/Core/Common/Src/x64Emitter.cpp @@ -23,8 +23,6 @@ namespace Gen { -static bool enableBranchHints = false; - // TODO(ector): Add EAX special casing, for ever so slightly smaller code. struct NormalOpDef { diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index dc2f9759e7..d67332eed4 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -141,7 +141,6 @@ bool CBoot::LoadMapFromFilename(const std::string &_rFilename, const char *_game // Load a GC or Wii BIOS file bool CBoot::Load_BIOS(const std::string& _rBiosFilename) { - bool bResult = false; std::string data; if (!File::ReadFileToString(false, _rBiosFilename.c_str(), data)) return false; diff --git a/Source/Core/Core/Src/Boot/Boot_BIOSEmu.cpp b/Source/Core/Core/Src/Boot/Boot_BIOSEmu.cpp index f367b36be8..372957a907 100644 --- a/Source/Core/Core/Src/Boot/Boot_BIOSEmu.cpp +++ b/Source/Core/Core/Src/Boot/Boot_BIOSEmu.cpp @@ -162,10 +162,10 @@ bool CBoot::SetupWiiMemory(unsigned int _CountryCode) INFO_LOG(BOOT, "Setup Wii Memory..."); // Write the 256 byte setting.txt to memory. This may not be needed as - // most or all games read the setting.txt file from \title\00000001\00000002\ - // data\setting.txt directly after the read the SYSCONF file. The games also - // read it to 0x3800, what is a little strange however is that it only reads - // the first 100 bytes of it. + // most or all games read the setting.txt file from + // \title\00000001\00000002\data\setting.txt directly after the read the + // SYSCONF file. The games also read it to 0x3800, what is a little strange + // however is that it only reads the first 100 bytes of it. std::string filename(File::GetSysDirectory() + WII_SYS_DIR + DIR_SEP + WII_EUR_SETTING); switch((DiscIO::IVolume::ECountry)_CountryCode) { diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index 2da395cd19..dcb4352037 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -679,8 +679,6 @@ void Callback_VideoCopiedToXFB() //count FPS static Common::Timer Timer; static u32 frames = 0; - static u64 ticks = 0; - static u64 idleTicks = 0; u32 targetfps = (SConfig::GetInstance().m_Framelimit)*5; @@ -782,7 +780,6 @@ void Callback_VideoCopiedToXFB() float TargetFPS = FPS_To_VPS_Rate * (float)VideoInterface::TargetRefreshRate; float FPSPercentage = (FPS / TargetFPS) * 100.0f; - float VPSPercentage = (VideoInterface::ActualRefreshRate / (float)VideoInterface::TargetRefreshRate) * 100.0f; // Settings are shown the same for both extended and summary info std::string SSettings = StringFromFormat(" | Core: %s %s", @@ -804,6 +801,7 @@ void Callback_VideoCopiedToXFB() std::string IdleSkipMessage = ""; if (_CoreParameter.bSkipIdle || _CoreParameter.bUseDualCore) IdleSkipMessage = "~"; #ifdef EXTENDED_INFO + float VPSPercentage = (VideoInterface::ActualRefreshRate / (float)VideoInterface::TargetRefreshRate) * 100.0f; std::string SFPS = StringFromFormat("FPS: %4.1f/%s%2.0f (%s%3.0f%% | %s%1.2f) VPS:%4.0f/%i (%3.0f%%)", FPS, IdleSkipMessage.c_str(), TargetFPS, IdleSkipMessage.c_str(), FPSPercentage, IdleSkipMessage.c_str(), FPS_To_VPS_Rate, diff --git a/Source/Core/InputCommon/Src/EventHandler.cpp b/Source/Core/InputCommon/Src/EventHandler.cpp index e01dd4a38a..4f78a56963 100644 --- a/Source/Core/InputCommon/Src/EventHandler.cpp +++ b/Source/Core/InputCommon/Src/EventHandler.cpp @@ -7,14 +7,10 @@ EventHandler *EventHandler::m_Instance = 0; EventHandler::EventHandler() { - for (int i=0; i