mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-01 13:48:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit 4cb46879bc
9 changed files with 40 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Source/Core/DiscIO/FileHandlerARC.cpp
View file

@ -5,6 +5,7 @@
#include <cstddef>
#include <cstdio>
#include <cstring>
#include <memory>
#include <string>
#include "Common/Common.h"
@ -22,13 +23,12 @@ CARCFile::CARCFile(const std::string& _rFilename)
: m_pBuffer(nullptr)
, m_Initialized(false)
{
DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rFilename.c_str());
if (pReader != nullptr)
std::unique_ptr<IBlobReader> reader(DiscIO::CreateBlobReader(_rFilename));
if (reader != nullptr)
{
u64 FileSize = pReader->GetDataSize();
u64 FileSize = reader->GetDataSize();
m_pBuffer = new u8[(u32)FileSize];
pReader->Read(0, FileSize, m_pBuffer);
delete pReader;
reader->Read(0, FileSize, m_pBuffer);
m_Initialized = ParseBuffer();
}
@ -38,13 +38,12 @@ CARCFile::CARCFile(const std::string& _rFilename, u32 offset)
: m_pBuffer(nullptr)
, m_Initialized(false)
{
DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rFilename.c_str());
if (pReader != nullptr)
std::unique_ptr<IBlobReader> reader(DiscIO::CreateBlobReader(_rFilename));
if (reader != nullptr)
{
u64 FileSize = pReader->GetDataSize() - offset;
u64 FileSize = reader->GetDataSize() - offset;
m_pBuffer = new u8[(u32)FileSize];
pReader->Read(offset, FileSize, m_pBuffer);
delete pReader;
reader->Read(offset, FileSize, m_pBuffer);
m_Initialized = ParseBuffer();
}