Browse files

VolumeWii: Shorten padding checking code within CheckIntegrity()

We can just use std::any_of here to collapse the checking code down to a
single assignment as opposed to a loop. This also slightly improves on
the existing code, as this won't continue to iterate through the cluster
metadata if an entry that's non-zero is encountered.
  • Loading branch information...
lioncash committed May 30, 2018
1 parent 4fb2d58 commit f845818cfe864fa2dd0525112e9ffb3e93763774
Showing with 3 additions and 4 deletions.
  1. +3 −4 Source/Core/DiscIO/VolumeWii.cpp
@@ -424,10 +424,9 @@ bool VolumeWii::CheckIntegrity(const Partition& partition) const
// This may cause some false negatives though: some bad clusters may be
// skipped because they are *too* bad and are not even recognized as
// valid clusters. To be improved.
bool meaningless = false;
for (u32 idx = 0x26C; idx < 0x280; ++idx)
if (cluster_metadata[idx] != 0)
meaningless = true;
const u8* pad_begin = cluster_metadata + 0x26C;
const u8* pad_end = pad_begin + 0x14;
const bool meaningless = std::any_of(pad_begin, pad_end, [](u8 val) { return val != 0; });
if (meaningless)

0 comments on commit f845818

Please sign in to comment.