diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-03-15 00:57:56 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-03-15 00:57:56 +0100 |
| commit | 8d679e76d299956a1521bc14502466be8d8b2df8 (patch) | |
| tree | 97db9ad6a45a8e5d711d7763199579e400a65bc8 /Source/Core/DiscIO/DiscScrubber.cpp | |
| parent | 12c2e345a35a571aadc842e30c38b3b4d8f70dce (diff) | |
| parent | a82675b7d581421fa80d5d5c53253cf1d5c1a26d (diff) | |
Merge pull request #164 from lioncash/cstr-cull
Kill off some usages of c_str.
Diffstat (limited to 'Source/Core/DiscIO/DiscScrubber.cpp')
| -rw-r--r-- | Source/Core/DiscIO/DiscScrubber.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp index 68a3e9f36f..b48967d31b 100644 --- a/Source/Core/DiscIO/DiscScrubber.cpp +++ b/Source/Core/DiscIO/DiscScrubber.cpp @@ -81,10 +81,10 @@ bool ParsePartitionData(SPartition& _rPartition); u32 GetDOLSize(u64 _DOLOffset); -bool SetupScrub(const char* filename, int block_size) +bool SetupScrub(const std::string& filename, int block_size) { bool success = true; - m_Filename = std::string(filename); + m_Filename = filename; m_BlockSize = block_size; if (CLUSTER_SIZE % m_BlockSize != 0) @@ -102,7 +102,7 @@ bool SetupScrub(const char* filename, int block_size) // Warn if not DVD5 or DVD9 size if (numClusters != 0x23048 && numClusters != 0x46090) - WARN_LOG(DISCIO, "%s is not a standard sized Wii disc! (%x blocks)", filename, numClusters); + WARN_LOG(DISCIO, "%s is not a standard sized Wii disc! (%x blocks)", filename.c_str(), numClusters); // Table of free blocks m_FreeTable = new u8[numClusters]; |