ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DiscScrubber: Convert a #define into a typed constant

This commit is contained in:
Lioncash 2017-01-04 19:53:31 -05:00
parent 0eaeca9d6d
commit b1a2dec78a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DiscIO/DiscScrubber.cpp
View File

@ -20,7 +20,7 @@
namespace DiscIO namespace DiscIO
{ {
#define CLUSTER_SIZE 0x8000 constexpr size_t CLUSTER_SIZE = 0x8000;
DiscScrubber::DiscScrubber() = default; DiscScrubber::DiscScrubber() = default;
DiscScrubber::~DiscScrubber() = default; DiscScrubber::~DiscScrubber() = default;
@ -43,17 +43,17 @@ bool DiscScrubber::SetupScrub(const std::string& filename, int block_size)
m_file_size = m_disc->GetSize(); m_file_size = m_disc->GetSize();
u32 numClusters = (u32)(m_file_size / CLUSTER_SIZE); const size_t num_clusters = static_cast<size_t>(m_file_size / CLUSTER_SIZE);
// Warn if not DVD5 or DVD9 size // Warn if not DVD5 or DVD9 size
if (numClusters != 0x23048 && numClusters != 0x46090) if (num_clusters != 0x23048 && num_clusters != 0x46090)
{ {
WARN_LOG(DISCIO, "%s is not a standard sized Wii disc! (%x blocks)", filename.c_str(), WARN_LOG(DISCIO, "%s is not a standard sized Wii disc! (%zx blocks)", filename.c_str(),
numClusters); num_clusters);
} }
// Table of free blocks // Table of free blocks
m_free_table.resize(numClusters, 1); m_free_table.resize(num_clusters, 1);
// Fill out table of free blocks // Fill out table of free blocks
const bool success = ParseDisc(); const bool success = ParseDisc();