diff options
| author | Tillmann Karras <tilkax@gmail.com> | 2014-03-09 21:14:26 +0100 |
|---|---|---|
| committer | Tillmann Karras <tilkax@gmail.com> | 2014-03-09 21:14:26 +0100 |
| commit | d802d392811be44d34ae9cd23f616db93e54c50f (patch) | |
| tree | f9aa8831a0731ea246bd921d979f4bffa7f07bd0 /Source/Core/DiscIO/VolumeDirectory.cpp | |
| parent | f28116b7da6aac6069084596dc4dbf866bdebfd8 (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/VolumeDirectory.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeDirectory.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/Core/DiscIO/VolumeDirectory.cpp b/Source/Core/DiscIO/VolumeDirectory.cpp index 50a380a278..a8b350c96b 100644 --- a/Source/Core/DiscIO/VolumeDirectory.cpp +++ b/Source/Core/DiscIO/VolumeDirectory.cpp @@ -26,11 +26,11 @@ CVolumeDirectory::CVolumeDirectory(const std::string& _rDirectory, bool _bIsWii, : m_totalNameSize(0) , m_dataStartAddress(-1) , m_fstSize(0) - , m_FSTData(NULL) + , m_FSTData(nullptr) , m_apploaderSize(0) - , m_apploader(NULL) + , m_apploader(nullptr) , m_DOLSize(0) - , m_DOL(NULL) + , m_DOL(nullptr) , FST_ADDRESS(0) , DOL_ADDRESS(0) { @@ -63,19 +63,19 @@ CVolumeDirectory::CVolumeDirectory(const std::string& _rDirectory, bool _bIsWii, CVolumeDirectory::~CVolumeDirectory() { delete[] m_FSTData; - m_FSTData = NULL; + m_FSTData = nullptr; delete[] m_diskHeader; - m_diskHeader = NULL; + m_diskHeader = nullptr; delete m_diskHeaderInfo; - m_diskHeaderInfo = NULL; + m_diskHeaderInfo = nullptr; delete[] m_DOL; - m_DOL = NULL; + m_DOL = nullptr; delete[] m_apploader; - m_apploader = NULL; + m_apploader = nullptr; } bool CVolumeDirectory::IsValidDirectory(const std::string& _rDirectory) @@ -134,7 +134,7 @@ bool CVolumeDirectory::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const u64 fileOffset = _Offset - fileIter->first; PlainFileReader* reader = PlainFileReader::Create(fileIter->second.c_str()); - if(reader == NULL) + if(reader == nullptr) return false; u64 fileSize = reader->GetDataSize(); |