piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Volume/VolumeGC/VolumeWii: Amend variable naming

Browse Source 
Drops prefixed underscores and normalizes names to follow our coding
style.
This commit is contained in:
Lioncash
2018-05-30 02:37:13 -04:00
parent ae4aa0b25c
commit 66122f037e
5 changed files with 74 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Core/DiscIO/VolumeGC.cpp
View File

@ -28,9 +28,9 @@
namespace DiscIO
{
VolumeGC::VolumeGC(std::unique_ptr<BlobReader> reader) : m_pReader(std::move(reader))
VolumeGC::VolumeGC(std::unique_ptr<BlobReader> reader) : m_reader(std::move(reader))
{
ASSERT(m_pReader);
ASSERT(m_reader);
m_file_system = [this]() -> std::unique_ptr<FileSystem> {
auto file_system = std::make_unique<FileSystemGCWii>(this, PARTITION_NONE);
@ -44,12 +44,12 @@ VolumeGC::~VolumeGC()
{
}
bool VolumeGC::Read(u64 _Offset, u64 _Length, u8* _pBuffer, const Partition& partition) const
bool VolumeGC::Read(u64 offset, u64 length, u8* buffer, const Partition& partition) const
{
if (partition != PARTITION_NONE)
return false;
return m_pReader->Read(_Offset, _Length, _pBuffer);
return m_reader->Read(offset, length, buffer);
}
const FileSystem* VolumeGC::GetFileSystem(const Partition& partition) const
@ -61,15 +61,15 @@ std::string VolumeGC::GetGameID(const Partition& partition) const
{
static const std::string NO_UID("NO_UID");
char ID[6];
char id[6];
if (!Read(0, sizeof(ID), reinterpret_cast<u8*>(ID), partition))
if (!Read(0, sizeof(id), reinterpret_cast<u8*>(id), partition))
{
PanicAlertT("Failed to read unique ID from disc image");
return NO_UID;
}
return DecodeString(ID);
return DecodeString(id);
}
Region VolumeGC::GetRegion() const
@ -103,11 +103,11 @@ Country VolumeGC::GetCountry(const Partition& partition) const
std::string VolumeGC::GetMakerID(const Partition& partition) const
{
char makerID[2];
if (!Read(0x4, 0x2, (u8*)&makerID, partition))
char maker_id[2];
if (!Read(0x4, 0x2, reinterpret_cast<u8*>(&maker_id), partition))
return std::string();
return DecodeString(makerID);
return DecodeString(maker_id);
}
std::optional<u16> VolumeGC::GetRevision(const Partition& partition) const
@ -168,17 +168,17 @@ std::string VolumeGC::GetApploaderDate(const Partition& partition) const
BlobType VolumeGC::GetBlobType() const
{
return m_pReader->GetBlobType();
return m_reader->GetBlobType();
}
u64 VolumeGC::GetSize() const
{
return m_pReader->GetDataSize();
return m_reader->GetDataSize();
}
u64 VolumeGC::GetRawSize() const
{
return m_pReader->GetRawSize();
return m_reader->GetRawSize();
}
std::optional<u8> VolumeGC::GetDiscNumber(const Partition& partition) const