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/VolumeGC.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/VolumeGC.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeGC.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index 4e057df78c..63c60a9846 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -22,12 +22,12 @@ CVolumeGC::CVolumeGC(IBlobReader* _pReader) CVolumeGC::~CVolumeGC() { delete m_pReader; - m_pReader = NULL; // I don't think this makes any difference, but anyway + m_pReader = nullptr; // I don't think this makes any difference, but anyway } bool CVolumeGC::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const { - if (m_pReader == NULL) + if (m_pReader == nullptr) return false; FileMon::FindFilename(_Offset); @@ -43,7 +43,7 @@ bool CVolumeGC::RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const std::string CVolumeGC::GetUniqueID() const { static const std::string NO_UID("NO_UID"); - if (m_pReader == NULL) + if (m_pReader == nullptr) return NO_UID; char ID[7]; @@ -77,7 +77,7 @@ IVolume::ECountry CVolumeGC::GetCountry() const std::string CVolumeGC::GetMakerID() const { - if (m_pReader == NULL) + if (m_pReader == nullptr) return std::string(); char makerID[3]; @@ -107,7 +107,7 @@ std::vector<std::string> CVolumeGC::GetNames() const auto const string_decoder = GetStringDecoder(GetCountry()); char name[0x60 + 1] = {}; - if (m_pReader != NULL && Read(0x20, 0x60, (u8*)name)) + if (m_pReader != nullptr && Read(0x20, 0x60, (u8*)name)) names.push_back(string_decoder(name)); return names; @@ -115,7 +115,7 @@ std::vector<std::string> CVolumeGC::GetNames() const u32 CVolumeGC::GetFSTSize() const { - if (m_pReader == NULL) + if (m_pReader == nullptr) return 0; u32 size; @@ -127,7 +127,7 @@ u32 CVolumeGC::GetFSTSize() const std::string CVolumeGC::GetApploaderDate() const { - if (m_pReader == NULL) + if (m_pReader == nullptr) return std::string(); char date[16]; |