piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -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

9
Source/Core/DiscIO/DiscScrubber.cpp
View File

@ -6,6 +6,7 @@
#include <cinttypes>
#include <cstddef>
#include <cstdio>
#include <memory>
#include <string>
#include <vector>
@ -275,9 +276,9 @@ bool ParsePartitionData(SPartition& _rPartition)
// Ready some stuff
m_Disc = CreateVolumeFromFilename(m_Filename, _rPartition.GroupNumber, _rPartition.Number);
IFileSystem *FileSystem = CreateFileSystem(m_Disc);
std::unique_ptr<IFileSystem> filesystem(CreateFileSystem(m_Disc));
if (!FileSystem)
if (!filesystem)
{
ERROR_LOG(DISCIO, "Failed to create filesystem for group %d partition %u", _rPartition.GroupNumber, _rPartition.Number);
ParsedOK = false;
@ -285,7 +286,7 @@ bool ParsePartitionData(SPartition& _rPartition)
else
{
std::vector<const SFileInfo *> Files;
size_t numFiles = FileSystem->GetFileList(Files);
size_t numFiles = filesystem->GetFileList(Files);
// Mark things as used which are not in the filesystem
// Header, Header Information, Apploader
@ -330,8 +331,6 @@ bool ParsePartitionData(SPartition& _rPartition)
}
}
delete FileSystem;
// Swap back
delete m_Disc;
m_Disc = OldVolume;