ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3370 from rohit-n/warnings 

Silence -Wshadow and -Wmaybe-uninitialized warnings.
This commit is contained in:
Mathew Maidment 2015-12-21 11:44:51 -05:00
parent 44a3578993 aaa89d4f73
commit 4c62a5c0a4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/Boot/Boot.cpp
View File

@ -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);

2
Source/Core/DiscIO/VolumeCreator.cpp
View File

@ -128,7 +128,7 @@ static std::unique_ptr<IVolume> 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;