nax: Avoid re-parsing NAX data with GetFileType()

An instance of the NAX apploader already has an existing NAX instance in
memory. Calling directly into IdentifyType() directly would re-parse the
whole file again into yet another NAX instance, only to toss it away
again.

This gets rid of unnecessary/redundant file parsing and allocations.

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) {