INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-13 08:18:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make XCI comply to review and style guidelines

Browse Source
This commit is contained in:
Zach Hilman
2018-07-28 21:39:42 -04:00
parent 22342487e8
commit 239a3113e4
16 changed files with 223 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/file_sys/card_image.cpp
View File

@ -30,8 +30,8 @@ XCI::XCI(VirtualFile file_) : file(std::move(file_)), partitions(0x4) {
return;
}
const static std::array<std::string, 0x4> partition_names = {"update", "normal", "secure",
"logo"};
static constexpr std::array<const char*, 0x4> partition_names = {"update", "normal", "secure",
"logo"};
for (XCIPartition partition :
{XCIPartition::Update, XCIPartition::Normal, XCIPartition::Secure, XCIPartition::Logo}) {
@ -93,12 +93,9 @@ VirtualDir XCI::GetLogoPartition() const {
}
std::shared_ptr<NCA> XCI::GetNCAByType(NCAContentType type) const {
for (const auto& nca : ncas) {
if (nca->GetType() == type)
return nca;
}
return nullptr;
auto iter = std::find_if(ncas.begin(), ncas.end(),
[type](std::shared_ptr<NCA> nca) { return nca->GetType() == type; });
return iter == ncas.end() ? nullptr : *iter;
}
VirtualFile XCI::GetNCAFileByType(NCAContentType type) const {
@ -133,7 +130,7 @@ Loader::ResultStatus XCI::AddNCAFromPartition(XCIPartition part) {
return Loader::ResultStatus::ErrorInvalidFormat;
}
for (VirtualFile file : partitions[static_cast<size_t>(part)]->GetFiles()) {
for (const VirtualFile& file : partitions[static_cast<size_t>(part)]->GetFiles()) {
if (file->GetExtension() != "nca")
continue;
auto nca = std::make_shared<NCA>(file);