Exverge/suyu
3
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

file_sys/card_image: Make bracing consistent

Browse source 
Makes for more consistent reading.
This commit is contained in:
Lioncash 2019-06-10 23:13:14 -04:00
parent e34368249f
commit 81d361d9f8
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/file_sys/card_image.cpp
View file

@ -63,8 +63,9 @@ XCI::XCI(VirtualFile file_)
program = program =
secure_partition->GetNCA(secure_partition->GetProgramTitleID(), ContentRecordType::Program); secure_partition->GetNCA(secure_partition->GetProgramTitleID(), ContentRecordType::Program);
program_nca_status = secure_partition->GetProgramStatus(secure_partition->GetProgramTitleID()); program_nca_status = secure_partition->GetProgramStatus(secure_partition->GetProgramTitleID());
if (program_nca_status == Loader::ResultStatus::ErrorNSPMissingProgramNCA) if (program_nca_status == Loader::ResultStatus::ErrorNSPMissingProgramNCA) {
program_nca_status = Loader::ResultStatus::ErrorXCIMissingProgramNCA; program_nca_status = Loader::ResultStatus::ErrorXCIMissingProgramNCA;
}
auto result = AddNCAFromPartition(XCIPartition::Update); auto result = AddNCAFromPartition(XCIPartition::Update);
if (result != Loader::ResultStatus::Success) { if (result != Loader::ResultStatus::Success) {
@ -152,8 +153,9 @@ std::shared_ptr<NCA> XCI::GetNCAByType(NCAContentType type) const {
VirtualFile XCI::GetNCAFileByType(NCAContentType type) const { VirtualFile XCI::GetNCAFileByType(NCAContentType type) const {
auto nca = GetNCAByType(type); auto nca = GetNCAByType(type);
if (nca != nullptr) if (nca != nullptr) {
return nca->GetBaseFile(); return nca->GetBaseFile();
}
return nullptr; return nullptr;
} }
@ -179,12 +181,14 @@ Loader::ResultStatus XCI::AddNCAFromPartition(XCIPartition part) {
} }
for (const VirtualFile& file : partitions[static_cast<std::size_t>(part)]->GetFiles()) { for (const VirtualFile& file : partitions[static_cast<std::size_t>(part)]->GetFiles()) {
if (file->GetExtension() != "nca") if (file->GetExtension() != "nca") {
continue; continue;
}
auto nca = std::make_shared<NCA>(file, nullptr, 0, keys); auto nca = std::make_shared<NCA>(file, nullptr, 0, keys);
// TODO(DarkLordZach): Add proper Rev1+ Support // TODO(DarkLordZach): Add proper Rev1+ Support
if (nca->IsUpdate()) if (nca->IsUpdate()) {
continue; continue;
}
if (nca->GetType() == NCAContentType::Program) { if (nca->GetType() == NCAContentType::Program) {
program_nca_status = nca->GetStatus(); program_nca_status = nca->GetStatus();
} }