From 4cb46879bc2fb517d0db70d5bcb53685a9ab0102 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 31 Aug 2014 09:34:58 -0400 Subject: DiscIO: Move some raw pointers over to unique_ptr --- Source/Core/DiscIO/FileHandlerARC.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'Source/Core/DiscIO/FileHandlerARC.cpp') diff --git a/Source/Core/DiscIO/FileHandlerARC.cpp b/Source/Core/DiscIO/FileHandlerARC.cpp index 96bfaf9c57..9d53f0a0b9 100644 --- a/Source/Core/DiscIO/FileHandlerARC.cpp +++ b/Source/Core/DiscIO/FileHandlerARC.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #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 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 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(); } -- cgit v1.2.3