yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

XCI: Add function for checking the existence of the program NCA 

The only reason the getter existed was to check whether or not the
program NCA was null. Instead, we can just provide a function to query
for the existence of it, instead of exposing it entirely.
This commit is contained in:
Lioncash 2018-10-16 11:36:55 -04:00
parent 78f2a6a9e1
commit 73e1e929a2
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,14 +122,16 @@ u64 XCI::GetProgramTitleID() const {
return secure_partition->GetProgramTitleID(); return secure_partition->GetProgramTitleID();
} }
std::shared_ptr<NCA> XCI::GetProgramNCA() const { bool XCI::HasProgramNCA() const {
return program; return program != nullptr;
} }
VirtualFile XCI::GetProgramNCAFile() const { VirtualFile XCI::GetProgramNCAFile() const {
if (GetProgramNCA() == nullptr) if (!HasProgramNCA()) {
return nullptr; return nullptr;
return GetProgramNCA()->GetBaseFile(); }
return program->GetBaseFile();
} }
const std::vector<std::shared_ptr<NCA>>& XCI::GetNCAs() const { const std::vector<std::shared_ptr<NCA>>& XCI::GetNCAs() const {

2
src/core/file_sys/card_image.h
View File

@ -80,7 +80,7 @@ public:
u64 GetProgramTitleID() const; u64 GetProgramTitleID() const;
std::shared_ptr<NCA> GetProgramNCA() const; bool HasProgramNCA() const;
VirtualFile GetProgramNCAFile() const; VirtualFile GetProgramNCAFile() const;
const std::vector<std::shared_ptr<NCA>>& GetNCAs() const; const std::vector<std::shared_ptr<NCA>>& GetNCAs() const;
std::shared_ptr<NCA> GetNCAByType(NCAContentType type) const; std::shared_ptr<NCA> GetNCAByType(NCAContentType type) const;

3
src/core/loader/xci.cpp
View File

@ -59,8 +59,7 @@ ResultStatus AppLoader_XCI::Load(Kernel::Process& process) {
if (xci->GetProgramNCAStatus() != ResultStatus::Success) if (xci->GetProgramNCAStatus() != ResultStatus::Success)
return xci->GetProgramNCAStatus(); return xci->GetProgramNCAStatus();
const auto nca = xci->GetProgramNCA(); if (!xci->HasProgramNCA() && !Core::Crypto::KeyManager::KeyFileExists(false))
if (nca == nullptr && !Core::Crypto::KeyManager::KeyFileExists(false))
return ResultStatus::ErrorMissingProductionKeyFile; return ResultStatus::ErrorMissingProductionKeyFile;
const auto result = nca_loader->Load(process); const auto result = nca_loader->Load(process);