From a82675b7d581421fa80d5d5c53253cf1d5c1a26d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 12 Mar 2014 15:33:41 -0400 Subject: Kill off some usages of c_str. Also changes some function params, but this is ok. Some simplifications were also able to be made (ie. killing off strcmps with ==, etc). --- Source/Core/DiscIO/VolumeDirectory.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/Core/DiscIO/VolumeDirectory.cpp') diff --git a/Source/Core/DiscIO/VolumeDirectory.cpp b/Source/Core/DiscIO/VolumeDirectory.cpp index 53dd7380cc..c60c38f387 100644 --- a/Source/Core/DiscIO/VolumeDirectory.cpp +++ b/Source/Core/DiscIO/VolumeDirectory.cpp @@ -133,7 +133,7 @@ bool CVolumeDirectory::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const _dbg_assert_(DVDINTERFACE, fileIter->first <= _Offset); u64 fileOffset = _Offset - fileIter->first; - PlainFileReader* reader = PlainFileReader::Create(fileIter->second.c_str()); + PlainFileReader* reader = PlainFileReader::Create(fileIter->second); if (reader == nullptr) return false; @@ -326,12 +326,12 @@ bool CVolumeDirectory::SetApploader(const std::string& _rApploader) } } -void CVolumeDirectory::SetDOL(const std::string& _rDOL) +void CVolumeDirectory::SetDOL(const std::string& rDOL) { - if (!_rDOL.empty()) + if (!rDOL.empty()) { std::string data; - File::ReadFileToString(_rDOL.c_str(), data); + File::ReadFileToString(rDOL, data); m_DOLSize = data.size(); m_DOL = new u8[m_DOLSize]; copy(data.begin(), data.end(), m_DOL); -- cgit v1.2.3