Merge pull request #1066 from lioncash/breaks

DiscIO: Remove unnecessary break statements.
dolphin-emu · Sep 13, 2014 · eee473e · eee473e
2 parents 9607cc4 + 4db2af2
commit eee473e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git 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
@@ -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;
 }