From 6d909b3e30c4b1043e6af5313d726e17909b44fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Mon, 23 Jan 2017 18:02:00 +0100 Subject: VolumeWad: In-class initialise member variables --- Source/Core/DiscIO/VolumeWad.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Source/Core/DiscIO/VolumeWad.cpp') diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp index 7c089ad10a..e470f10283 100644 --- a/Source/Core/DiscIO/VolumeWad.cpp +++ b/Source/Core/DiscIO/VolumeWad.cpp @@ -22,9 +22,7 @@ namespace DiscIO { -CVolumeWAD::CVolumeWAD(std::unique_ptr reader) - : m_pReader(std::move(reader)), m_offset(0), m_tmd_offset(0), m_opening_bnr_offset(0), - m_hdr_size(0), m_cert_size(0), m_tick_size(0), m_tmd_size(0), m_data_size(0) +CVolumeWAD::CVolumeWAD(std::unique_ptr reader) : m_pReader(std::move(reader)) { // Source: http://wiibrew.org/wiki/WAD_files Read(0x00, 4, (u8*)&m_hdr_size); -- cgit v1.2.3 From 61286793969a0060ff58eb354538a619d8d89a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Mon, 23 Jan 2017 18:06:08 +0100 Subject: VolumeWad: Clean up variable naming --- Source/Core/DiscIO/VolumeWad.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Source/Core/DiscIO/VolumeWad.cpp') diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp index e470f10283..148ca83597 100644 --- a/Source/Core/DiscIO/VolumeWad.cpp +++ b/Source/Core/DiscIO/VolumeWad.cpp @@ -22,7 +22,7 @@ namespace DiscIO { -CVolumeWAD::CVolumeWAD(std::unique_ptr reader) : m_pReader(std::move(reader)) +CVolumeWAD::CVolumeWAD(std::unique_ptr reader) : m_reader(std::move(reader)) { // Source: http://wiibrew.org/wiki/WAD_files Read(0x00, 4, (u8*)&m_hdr_size); @@ -44,15 +44,15 @@ CVolumeWAD::~CVolumeWAD() { } -bool CVolumeWAD::Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt) const +bool CVolumeWAD::Read(u64 offset, u64 length, u8* buffer, bool decrypt) const { if (decrypt) PanicAlertT("Tried to decrypt data from a non-Wii volume"); - if (m_pReader == nullptr) + if (m_reader == nullptr) return false; - return m_pReader->Read(_Offset, _Length, _pBuffer); + return m_reader->Read(offset, length, buffer); } Region CVolumeWAD::GetRegion() const @@ -116,7 +116,7 @@ bool CVolumeWAD::GetTitleID(u64* buffer) const u16 CVolumeWAD::GetRevision() const { u16 revision; - if (!m_pReader->Read(m_tmd_offset + 0x1dc, 2, (u8*)&revision)) + if (!m_reader->Read(m_tmd_offset + 0x1dc, 2, (u8*)&revision)) return 0; return Common::swap16(revision); @@ -149,21 +149,21 @@ std::vector CVolumeWAD::GetBanner(int* width, int* height) const BlobType CVolumeWAD::GetBlobType() const { - return m_pReader ? m_pReader->GetBlobType() : BlobType::PLAIN; + return m_reader ? m_reader->GetBlobType() : BlobType::PLAIN; } u64 CVolumeWAD::GetSize() const { - if (m_pReader) - return m_pReader->GetDataSize(); + if (m_reader) + return m_reader->GetDataSize(); else return 0; } u64 CVolumeWAD::GetRawSize() const { - if (m_pReader) - return m_pReader->GetRawSize(); + if (m_reader) + return m_reader->GetRawSize(); else return 0; } -- cgit v1.2.3 From f89aaee91a8d9d1f49030432627f94f2293daa3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Mon, 23 Jan 2017 18:09:29 +0100 Subject: VolumeWad: Remove useless else after return --- Source/Core/DiscIO/VolumeWad.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'Source/Core/DiscIO/VolumeWad.cpp') diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp index 148ca83597..9e715a82da 100644 --- a/Source/Core/DiscIO/VolumeWad.cpp +++ b/Source/Core/DiscIO/VolumeWad.cpp @@ -154,18 +154,12 @@ BlobType CVolumeWAD::GetBlobType() const u64 CVolumeWAD::GetSize() const { - if (m_reader) - return m_reader->GetDataSize(); - else - return 0; + return m_reader ? m_reader->GetDataSize() : 0; } u64 CVolumeWAD::GetRawSize() const { - if (m_reader) - return m_reader->GetRawSize(); - else - return 0; + return m_reader ? m_reader->GetRawSize() : 0; } } // namespace -- cgit v1.2.3