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:
NeoBrainX 2010-08-13 19:07:59 +00:00
parent 0c1977dc45
commit 1f9dbb5afe
3 changed files with 29 additions and 29 deletions

View File

@ -202,7 +202,7 @@ bool DSPDisassembler::DisOpcode(const u16 *binbuf, int base_addr, int pass, u16
if ((*pc & 0x7fff) >= 0x1000)
{
*pc++;
++pc;
dest.append("; outside memory");
return false;
}

View File

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

View File

@ -107,19 +107,19 @@ std::string CVolumeWiiCrypted::GetUniqueID() const
{
if (m_pReader == NULL)
{
return(false);
return std::string();
}
char ID[7];
if (!Read(0, 6, (u8*)ID))
{
return(false);
return std::string();
}
ID[6] = 0;
ID[6] = '\0';
return(ID);
return ID;
}
@ -138,83 +138,83 @@ std::string CVolumeWiiCrypted::GetMakerID() const
{
if (m_pReader == NULL)
{
return(false);
return std::string();
}
char makerID[3];
if (!Read(0x4, 0x2, (u8*)&makerID))
{
return(false);
return std::string();
}
makerID[2] = 0;
makerID[2] = '\0';
return(makerID);
return makerID;
}
std::string CVolumeWiiCrypted::GetName() const
{
if (m_pReader == NULL)
{
return("");
return std::string();
}
char name[0xFF];
if (!Read(0x20, 0x60, (u8*)&name))
{
return("");
return std::string();
}
return(name);
return name;
}
u32 CVolumeWiiCrypted::GetFSTSize() const
{
if (m_pReader == NULL)
{
return(false);
return 0;
}
u32 size;
if (!Read(0x428, 0x4, (u8*)&size))
{
return(false);
return 0;
}
return(size);
return size;
}
std::string CVolumeWiiCrypted::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();
}
date[10] = 0;
date[10] = '\0';
return(date);
return date;
}
u64 CVolumeWiiCrypted::GetSize() const
{
if (m_pReader)
{
return(m_pReader->GetDataSize());
return m_pReader->GetDataSize();
}
else
{
return(0);
return 0;
}
}