summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/DiscScrubber.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-08-31 09:34:58 -0400
committerLioncash <mathew1800@gmail.com>2014-08-31 14:48:57 -0400
commit4cb46879bc2fb517d0db70d5bcb53685a9ab0102 (patch)
tree95ad6c206fdfa5c923fce2f7a4f8fe68d0c9243b /Source/Core/DiscIO/DiscScrubber.cpp
parentea7eee1f585c60cfade51269e356c75c8e16955b (diff)
DiscIO: Move some raw pointers over to unique_ptr
Diffstat (limited to 'Source/Core/DiscIO/DiscScrubber.cpp')
-rw-r--r--Source/Core/DiscIO/DiscScrubber.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp
index 77936d16b4..8fb33ddfe7 100644
--- a/Source/Core/DiscIO/DiscScrubber.cpp
+++ b/Source/Core/DiscIO/DiscScrubber.cpp
@@ -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;