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/DiscScrubber.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/DiscIO/DiscScrubber.cpp') 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]; -- cgit v1.2.3