diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-09-19 20:13:00 +0200 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-09-19 20:22:37 +0200 |
| commit | 45195a51a76b3000e028234f619a4d15bff443eb (patch) | |
| tree | 5261c2ea094b4022505cd8e6f64911f877304ebd /src/core/loader/nax.cpp | |
| parent | nax: Avoid unnecessary calls to AsNCA() in IdentifyType() (diff) | |
| download | yuzu-45195a51a76b3000e028234f619a4d15bff443eb.tar yuzu-45195a51a76b3000e028234f619a4d15bff443eb.tar.gz yuzu-45195a51a76b3000e028234f619a4d15bff443eb.tar.bz2 yuzu-45195a51a76b3000e028234f619a4d15bff443eb.tar.lz yuzu-45195a51a76b3000e028234f619a4d15bff443eb.tar.xz yuzu-45195a51a76b3000e028234f619a4d15bff443eb.tar.zst yuzu-45195a51a76b3000e028234f619a4d15bff443eb.zip | |
Diffstat (limited to 'src/core/loader/nax.cpp')
| -rw-r--r-- | src/core/loader/nax.cpp | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/src/core/loader/nax.cpp b/src/core/loader/nax.cpp index 02a0d5ba7..5d4380684 100644 --- a/src/core/loader/nax.cpp +++ b/src/core/loader/nax.cpp @@ -11,16 +11,8 @@ #include "core/loader/nca.h" namespace Loader { - -AppLoader_NAX::AppLoader_NAX(FileSys::VirtualFile file) - : AppLoader(file), nax(std::make_unique<FileSys::NAX>(file)), - nca_loader(std::make_unique<AppLoader_NCA>(nax->GetDecrypted())) {} - -AppLoader_NAX::~AppLoader_NAX() = default; - -FileType AppLoader_NAX::IdentifyType(const FileSys::VirtualFile& file) { - FileSys::NAX nax(file); - +namespace { +FileType IdentifyTypeImpl(const FileSys::NAX& nax) { if (nax.GetStatus() != ResultStatus::Success) { return FileType::Error; } @@ -32,6 +24,22 @@ FileType AppLoader_NAX::IdentifyType(const FileSys::VirtualFile& file) { return FileType::NAX; } +} // Anonymous namespace + +AppLoader_NAX::AppLoader_NAX(FileSys::VirtualFile file) + : AppLoader(file), nax(std::make_unique<FileSys::NAX>(file)), + nca_loader(std::make_unique<AppLoader_NCA>(nax->GetDecrypted())) {} + +AppLoader_NAX::~AppLoader_NAX() = default; + +FileType AppLoader_NAX::IdentifyType(const FileSys::VirtualFile& file) { + const FileSys::NAX nax(file); + return IdentifyTypeImpl(nax); +} + +FileType AppLoader_NAX::GetFileType() { + return IdentifyTypeImpl(*nax); +} ResultStatus AppLoader_NAX::Load(Kernel::SharedPtr<Kernel::Process>& process) { if (is_loaded) { |