mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-22 22:00:39 -06:00
Warning fixes and some cleanups.
Correct me if I was wrong when changing those 0s to '\0's. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6093 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -78,12 +78,12 @@ IVolume::ECountry CVolumeGC::GetCountry() const
|
||||
std::string CVolumeGC::GetMakerID() const
|
||||
{
|
||||
if (m_pReader == NULL)
|
||||
return false;
|
||||
return std::string();
|
||||
|
||||
char makerID[3];
|
||||
if (!Read(0x4, 0x2, (u8*)&makerID))
|
||||
return false;
|
||||
makerID[2] = 0;
|
||||
return std::string();
|
||||
makerID[2] = '\0';
|
||||
|
||||
return makerID;
|
||||
}
|
||||
@ -103,11 +103,11 @@ std::string CVolumeGC::GetName() const
|
||||
u32 CVolumeGC::GetFSTSize() const
|
||||
{
|
||||
if (m_pReader == NULL)
|
||||
return false;
|
||||
return 0;
|
||||
|
||||
u32 size;
|
||||
if (!Read(0x428, 0x4, (u8*)&size))
|
||||
return false;
|
||||
return 0;
|
||||
|
||||
return Common::swap32(size);
|
||||
}
|
||||
@ -115,13 +115,13 @@ u32 CVolumeGC::GetFSTSize() const
|
||||
std::string CVolumeGC::GetApploaderDate() const
|
||||
{
|
||||
if (m_pReader == NULL)
|
||||
return false;
|
||||
return std::string();
|
||||
|
||||
char date[16];
|
||||
if (!Read(0x2440, 0x10, (u8*)&date))
|
||||
return false;
|
||||
return std::string();
|
||||
// Should be 0 already, but just in case
|
||||
date[10] = 0;
|
||||
date[10] = '\0';
|
||||
|
||||
return date;
|
||||
}
|
||||
|
Reference in New Issue
Block a user