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

DiscIO: Move some raw pointers over to unique_ptr

Browse Source
This commit is contained in:
Lioncash
2014-08-31 09:34:58 -04:00
parent ea7eee1f58
commit 4cb46879bc
9 changed files with 40 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Source/Core/DiscIO/WiiWad.cpp
View File

@ -4,6 +4,7 @@
#include <cstddef>
#include <memory>
#include <string>
#include "Common/Common.h"
@ -32,18 +33,16 @@ private:
DiscIO::IBlobReader& m_rReader;
};
WiiWAD::WiiWAD(const std::string& _rName)
WiiWAD::WiiWAD(const std::string& name)
{
DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName);
if (pReader == nullptr || File::IsDirectory(_rName))
std::unique_ptr<IBlobReader> reader(DiscIO::CreateBlobReader(name));
if (reader == nullptr || File::IsDirectory(name))
{
m_Valid = false;
if (pReader) delete pReader;
return;
}
m_Valid = ParseWAD(*pReader);
delete pReader;
m_Valid = ParseWAD(*reader);
}
WiiWAD::~WiiWAD()
@ -118,30 +117,28 @@ bool WiiWAD::ParseWAD(DiscIO::IBlobReader& _rReader)
return true;
}
bool WiiWAD::IsWiiWAD(const std::string& _rName)
bool WiiWAD::IsWiiWAD(const std::string& name)
{
DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName);
if (pReader == nullptr)
std::unique_ptr<IBlobReader> blob_reader(DiscIO::CreateBlobReader(name));
if (blob_reader == nullptr)
return false;
CBlobBigEndianReader Reader(*pReader);
bool Result = false;
CBlobBigEndianReader big_endian_reader(*blob_reader);
bool result = false;
// check for wii wad
if (Reader.Read32(0x00) == 0x20)
if (big_endian_reader.Read32(0x00) == 0x20)
{
u32 WADTYpe = Reader.Read32(0x04);
switch (WADTYpe)
u32 wad_type = big_endian_reader.Read32(0x04);
switch (wad_type)
{
case 0x49730000:
case 0x69620000:
Result = true;
result = true;
}
}
delete pReader;
return Result;
return result;
}