file_sys/card_image: Deduplicate type cast

Same thing, less duplication. We can also std::move raw into the
PartitionFilesystem constructor.
This commit is contained in:
Lioncash 2019-06-10 23:02:48 -04:00
parent 825ffd7b1f
commit 288d027e89
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
1 changed files with 6 additions and 4 deletions

View File

@ -48,10 +48,12 @@ XCI::XCI(VirtualFile file_)
for (XCIPartition partition :
{XCIPartition::Update, XCIPartition::Normal, XCIPartition::Secure, XCIPartition::Logo}) {
auto raw = main_hfs.GetFile(partition_names[static_cast<std::size_t>(partition)]);
if (raw != nullptr)
partitions[static_cast<std::size_t>(partition)] =
std::make_shared<PartitionFilesystem>(raw);
const auto partition_idx = static_cast<std::size_t>(partition);
auto raw = main_hfs.GetFile(partition_names[partition_idx]);
if (raw != nullptr) {
partitions[partition_idx] = std::make_shared<PartitionFilesystem>(std::move(raw));
}
}
secure_partition = std::make_shared<NSP>(