From aaa89d4f73d2bf6c8c551c2af3b9a27c9b9bb313 Mon Sep 17 00:00:00 2001 From: Rohit Nirmal Date: Mon, 21 Dec 2015 09:58:13 -0600 Subject: [PATCH] Silence -Wshadow and -Wmaybe-uninitialized warnings. --- Source/Core/Core/Boot/Boot.cpp | 5 ++++- Source/Core/DiscIO/VolumeCreator.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp index 46b293c392..0fedaf7961 100644 --- a/Source/Core/Core/Boot/Boot.cpp +++ b/Source/Core/Core/Boot/Boot.cpp @@ -60,7 +60,10 @@ void CBoot::Load_FST(bool _bIsWii) if (_bIsWii) shift = 2; - u32 fst_offset, fst_size, max_fst_size; + u32 fst_offset = 0; + u32 fst_size = 0; + u32 max_fst_size = 0; + volume.ReadSwapped(0x0424, &fst_offset, _bIsWii); volume.ReadSwapped(0x0428, &fst_size, _bIsWii); volume.ReadSwapped(0x042c, &max_fst_size, _bIsWii); diff --git a/Source/Core/DiscIO/VolumeCreator.cpp b/Source/Core/DiscIO/VolumeCreator.cpp index 78d9dbfa02..a5cd74cb23 100644 --- a/Source/Core/DiscIO/VolumeCreator.cpp +++ b/Source/Core/DiscIO/VolumeCreator.cpp @@ -128,7 +128,7 @@ static std::unique_ptr CreateVolumeFromCryptedWiiImage(std::unique_ptr< struct SPartition { - SPartition(u64 offset, u32 type) : offset(offset), type(type) {} + SPartition(u64 offset_, u32 type_) : offset(offset_), type(type_) {} u64 offset; u32 type;