summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/DiscScrubber.cpp
diff options
context:
space:
mode:
authorTillmann Karras <tilkax@gmail.com>2014-03-09 21:14:26 +0100
committerTillmann Karras <tilkax@gmail.com>2014-03-09 21:14:26 +0100
commitd802d392811be44d34ae9cd23f616db93e54c50f (patch)
treef9aa8831a0731ea246bd921d979f4bffa7f07bd0 /Source/Core/DiscIO/DiscScrubber.cpp
parentf28116b7da6aac6069084596dc4dbf866bdebfd8 (diff)
clang-modernize -use-nullptr
and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine
Diffstat (limited to 'Source/Core/DiscIO/DiscScrubber.cpp')
-rw-r--r--Source/Core/DiscIO/DiscScrubber.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp
index 8c64dcd1b0..68a3e9f36f 100644
--- a/Source/Core/DiscIO/DiscScrubber.cpp
+++ b/Source/Core/DiscIO/DiscScrubber.cpp
@@ -24,7 +24,7 @@ namespace DiscScrubber
#define CLUSTER_SIZE 0x8000
-u8* m_FreeTable = NULL;
+u8* m_FreeTable = nullptr;
u64 m_FileSize;
u64 m_BlockCount;
u32 m_BlockSize;
@@ -32,7 +32,7 @@ int m_BlocksPerCluster;
bool m_isScrubbing = false;
std::string m_Filename;
-IVolume* m_Disc = NULL;
+IVolume* m_Disc = nullptr;
struct SPartitionHeader
{
@@ -112,7 +112,7 @@ bool SetupScrub(const char* filename, int block_size)
success = ParseDisc();
// Done with it; need it closed for the next part
delete m_Disc;
- m_Disc = NULL;
+ m_Disc = nullptr;
m_BlockCount = 0;
// Let's not touch the file if we've failed up to here :p
@@ -146,7 +146,7 @@ void GetNextBlock(File::IOFile& in, u8* buffer)
void Cleanup()
{
if (m_FreeTable) delete[] m_FreeTable;
- m_FreeTable = NULL;
+ m_FreeTable = nullptr;
m_FileSize = 0;
m_BlockCount = 0;
m_BlockSize = 0;