diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-05-19 23:32:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-19 23:32:17 +0200 |
| commit | ae9cb2e85f044946c0ffb7f721750d6ccd44b3ca (patch) | |
| tree | 27452a6986e1a40b4eddf34acc64a54f332990b5 /Source/Core/DiscIO/WiiWad.cpp | |
| parent | f32482b337fb67d09f7ac23578d818ca35f433fb (diff) | |
| parent | 78effbabc6e4b3131ac9eef3f9b8fd7e56a885f0 (diff) | |
Merge pull request #5447 from JosJuice/remove-cblobbigendianreader
Remove CBlobBigEndianReader
Diffstat (limited to 'Source/Core/DiscIO/WiiWad.cpp')
| -rw-r--r-- | Source/Core/DiscIO/WiiWad.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Source/Core/DiscIO/WiiWad.cpp b/Source/Core/DiscIO/WiiWad.cpp index 89b687eb95..06d8d57070 100644 --- a/Source/Core/DiscIO/WiiWad.cpp +++ b/Source/Core/DiscIO/WiiWad.cpp @@ -34,7 +34,7 @@ std::vector<u8> CreateWADEntry(IBlobReader& reader, u32 size, u64 offset) return buffer; } -bool IsWiiWAD(const CBlobBigEndianReader& reader) +bool IsWiiWAD(IBlobReader& reader) { u32 header_size = 0; u32 header_type = 0; @@ -61,9 +61,7 @@ WiiWAD::~WiiWAD() bool WiiWAD::ParseWAD() { - CBlobBigEndianReader big_endian_reader(*m_reader); - - if (!IsWiiWAD(big_endian_reader)) + if (!IsWiiWAD(*m_reader)) return false; u32 certificate_chain_size; @@ -73,12 +71,12 @@ bool WiiWAD::ParseWAD() u32 data_app_size; u32 footer_size; - if (!big_endian_reader.ReadSwapped(0x08, &certificate_chain_size) || - !big_endian_reader.ReadSwapped(0x0C, &reserved) || - !big_endian_reader.ReadSwapped(0x10, &ticket_size) || - !big_endian_reader.ReadSwapped(0x14, &tmd_size) || - !big_endian_reader.ReadSwapped(0x18, &data_app_size) || - !big_endian_reader.ReadSwapped(0x1C, &footer_size)) + if (!m_reader->ReadSwapped(0x08, &certificate_chain_size) || + !m_reader->ReadSwapped(0x0C, &reserved) || + !m_reader->ReadSwapped(0x10, &ticket_size) || + !m_reader->ReadSwapped(0x14, &tmd_size) || + !m_reader->ReadSwapped(0x18, &data_app_size) || + !m_reader->ReadSwapped(0x1C, &footer_size)) return false; if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG) |