diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-09-01 20:11:18 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-09-01 20:11:18 +0200 |
| commit | d9950d8cab8f8ab7f1a6873c182514f4220a9516 (patch) | |
| tree | e9c33e41152b1047d5d0306b52d182587bb00424 /Source/Core/DiscIO/DiscScrubber.cpp | |
| parent | 4bbf96ffd2b7e73f954e065fcde365e5dc65d5ef (diff) | |
| parent | 4cb46879bc2fb517d0db70d5bcb53685a9ab0102 (diff) | |
Merge pull request #921 from lioncash/unique
DiscIO: Move some raw pointers over to unique_ptr
Diffstat (limited to 'Source/Core/DiscIO/DiscScrubber.cpp')
| -rw-r--r-- | Source/Core/DiscIO/DiscScrubber.cpp | 9 |
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; |