From 4db2af2d42da5960b337e1cea8795598d4a947e8 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 12 Sep 2014 11:30:36 -0400 Subject: [PATCH] DiscIO: Remove unnecessary break statements. --- Source/Core/DiscIO/VolumeCommon.cpp | 11 ----------- Source/Core/DiscIO/VolumeCreator.cpp | 3 --- 2 files changed, 14 deletions(-) diff --git a/Source/Core/DiscIO/VolumeCommon.cpp b/Source/Core/DiscIO/VolumeCommon.cpp index 6db8bf21f2..cc2f468b7e 100644 --- a/Source/Core/DiscIO/VolumeCommon.cpp +++ b/Source/Core/DiscIO/VolumeCommon.cpp @@ -21,7 +21,6 @@ IVolume::ECountry CountrySwitch(u8 CountryCode) // PAL case 'D': // German return IVolume::COUNTRY_GERMANY; - break; case 'X': // Used by a couple PAL games case 'Y': // German, french @@ -32,50 +31,40 @@ IVolume::ECountry CountrySwitch(u8 CountryCode) case 'P': case 'U': // Australia return IVolume::COUNTRY_EUROPE; - break; case 'F': return IVolume::COUNTRY_FRANCE; - break; case 'I': return IVolume::COUNTRY_ITALY; - break; case 'R': return IVolume::COUNTRY_RUSSIA; - break; // NTSC case 'E': case 'N': // Japanese import to USA and other NTSC regions case 'Z': // Prince Of Persia - The Forgotten Sands (WII) return IVolume::COUNTRY_USA; - break; case 'J': return IVolume::COUNTRY_JAPAN; - break; case 'K': case 'T': // Korea with English language case 'Q': // Korea with Japanese language return IVolume::COUNTRY_KOREA; - break; case 'O': return IVolume::COUNTRY_SDK; - break; case 'W': return IVolume::COUNTRY_TAIWAN; - break; default: if (CountryCode > 'A') // Silently ignore IOS wads WARN_LOG(DISCIO, "Unknown Country Code! %c", CountryCode); return IVolume::COUNTRY_UNKNOWN; - break; } } diff --git a/Source/Core/DiscIO/VolumeCreator.cpp b/Source/Core/DiscIO/VolumeCreator.cpp index c3f5abeb3d..0b6fc465e8 100644 --- a/Source/Core/DiscIO/VolumeCreator.cpp +++ b/Source/Core/DiscIO/VolumeCreator.cpp @@ -94,7 +94,6 @@ IVolume* CreateVolumeFromFilename(const std::string& _rFilename, u32 _PartitionG return pVolume; } - break; case DISC_TYPE_UNK: default: @@ -104,10 +103,8 @@ IVolume* CreateVolumeFromFilename(const std::string& _rFilename, u32 _PartitionG NOTICE_LOG(DISCIO, "%s does not have the Magic word for a gcm, wiidisc or wad file\n" "Set Log Verbosity to Warning and attempt to load the game again to view the values", Filename.c_str()); delete pReader; - return nullptr; } - // unreachable code return nullptr; }