Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DiscIO: initialize out args to ReadSwapped (fixes warning) #5152

Merged
merged 1 commit into from Mar 31, 2017
Merged

DiscIO: initialize out args to ReadSwapped (fixes warning) #5152

merged 1 commit into from Mar 31, 2017

Conversation

ligfx
Copy link
Contributor

@ligfx ligfx commented Mar 24, 2017

Fixes warnings:

../Source/Core/DiscIO/VolumeGC.cpp: In member function 'virtual u8 DiscIO::CVolumeGC::GetDiscNumber() const':
../Source/Core/DiscIO/VolumeGC.cpp:178:10: error: 'disc_number' may be used uninitialized in this function [-Werror=maybe-uninitialized]
   return disc_number;
          ^
../Source/Core/DiscIO/VolumeWiiCrypted.cpp: In member function 'virtual u8 DiscIO::CVolumeWiiCrypted::GetDiscNumber() const':
../Source/Core/DiscIO/VolumeWiiCrypted.cpp:258:10: error: 'disc_number' may be used uninitialized in this function [-Werror=maybe-uninitialized]
   return disc_number;
          ^
../Source/Core/DiscIO/VolumeWiiCrypted.cpp: In member function 'virtual IOS::ES::TMDReader DiscIO::CVolumeWiiCrypted::GetTMD() const':
../Source/Core/DiscIO/VolumeWiiCrypted.cpp:123:20: error: 'tmd_address' may be used uninitialized in this function [-Werror=maybe-uninitialized]
   tmd_address <<= 2;
                    ^

JosJuice
JosJuice reviewed Mar 25, 2017
View reviewed changes
Source/Core/DiscIO/VolumeWiiCrypted.cpp
u32 tmd_size;
u32 tmd_address;
u32 tmd_size = 0;
u32 tmd_address = 0;

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

@ligfx
DiscIO: make sure to initialize out args to ReadSwapped
4cd9a2e 
Fixes warnings:

```
../Source/Core/DiscIO/VolumeGC.cpp: In member function 'virtual u8 DiscIO::CVolumeGC::GetDiscNumber() const':
../Source/Core/DiscIO/VolumeGC.cpp:178:10: error: 'disc_number' may be used uninitialized in this function [-Werror=maybe-uninitialized]
   return disc_number;
          ^
../Source/Core/DiscIO/VolumeWiiCrypted.cpp: In member function 'virtual u8 DiscIO::CVolumeWiiCrypted::GetDiscNumber() const':
../Source/Core/DiscIO/VolumeWiiCrypted.cpp:258:10: error: 'disc_number' may be used uninitialized in this function [-Werror=maybe-uninitialized]
   return disc_number;
          ^
../Source/Core/DiscIO/VolumeWiiCrypted.cpp: In member function 'virtual IOS::ES::TMDReader DiscIO::CVolumeWiiCrypted::GetTMD() const':
../Source/Core/DiscIO/VolumeWiiCrypted.cpp:123:20: error: 'tmd_address' may be used uninitialized in this function [-Werror=maybe-uninitialized]
   tmd_address <<= 2;
                    ^
```
JosJuice
JosJuice approved these changes Mar 25, 2017
View reviewed changes
Copy link
Member

@JosJuice JosJuice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The added = 0s in GetTMD aren't necessary anymore now that we return if a read fails, but I guess having the = 0s there doesn't hurt. LGTM.

@lioncash lioncash merged commit 80a8123 into dolphin-emu:master Mar 31, 2017
@ligfx ligfx deleted the disciomaybeuninitialized branch May 24, 2017 21:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lioncash lioncash lioncash approved these changes

@JosJuice JosJuice JosJuice approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
3 participants
@ligfx @lioncash @JosJuice