From e4e55d064edd71fbf359dec9d6b5efad4f0d6c91 Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Sat, 25 Aug 2018 22:42:54 -0400
Subject: nsp: Comply with style and performance guidelines

---
 src/core/loader/nsp.cpp | 11 +++++++++--
 src/core/loader/nsp.h   |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/core/loader')

diff --git a/src/core/loader/nsp.cpp b/src/core/loader/nsp.cpp
index 75d9fc1bc..b59d40052 100644
--- a/src/core/loader/nsp.cpp
+++ b/src/core/loader/nsp.cpp
@@ -21,22 +21,27 @@ namespace Loader {
 AppLoader_NSP::AppLoader_NSP(FileSys::VirtualFile file)
     : AppLoader(file), nsp(std::make_unique<FileSys::NSP>(file)),
       title_id(nsp->GetProgramTitleID()) {
+
     if (nsp->GetStatus() != ResultStatus::Success)
         return;
     if (nsp->IsExtractedType())
         return;
+
     const auto control_nca =
         nsp->GetNCA(nsp->GetFirstTitleID(), FileSys::ContentRecordType::Control);
     if (control_nca == nullptr || control_nca->GetStatus() != ResultStatus::Success)
         return;
+
     const auto romfs = FileSys::ExtractRomFS(control_nca->GetRomFS());
     if (romfs == nullptr)
         return;
+
     for (const auto& language : FileSys::LANGUAGE_NAMES) {
         icon_file = romfs->GetFile("icon_" + std::string(language) + ".dat");
         if (icon_file != nullptr)
             break;
     }
+
     const auto nacp_raw = romfs->GetFile("control.nacp");
     if (nacp_raw == nullptr)
         return;
@@ -51,15 +56,17 @@ FileType AppLoader_NSP::IdentifyType(const FileSys::VirtualFile& file) {
     if (nsp.GetStatus() == ResultStatus::Success) {
         // Extracted Type case
         if (nsp.IsExtractedType() && nsp.GetExeFS() != nullptr &&
-            FileSys::IsDirectoryExeFS(nsp.GetExeFS()) && nsp.GetRomFS() != nullptr)
+            FileSys::IsDirectoryExeFS(nsp.GetExeFS()) && nsp.GetRomFS() != nullptr) {
             return FileType::NSP;
+        }
 
         // Non-Ectracted Type case
         if (!nsp.IsExtractedType() &&
             nsp.GetNCA(nsp.GetFirstTitleID(), FileSys::ContentRecordType::Program) != nullptr &&
             AppLoader_NCA::IdentifyType(nsp.GetNCAFile(
-                nsp.GetFirstTitleID(), FileSys::ContentRecordType::Program)) == FileType::NCA)
+                nsp.GetFirstTitleID(), FileSys::ContentRecordType::Program)) == FileType::NCA) {
             return FileType::NSP;
+        }
     }
 
     return FileType::Error;
diff --git a/src/core/loader/nsp.h b/src/core/loader/nsp.h
index 785feaf37..7ef810499 100644
--- a/src/core/loader/nsp.h
+++ b/src/core/loader/nsp.h
@@ -22,7 +22,7 @@ class AppLoader_NCA;
 class AppLoader_NSP final : public AppLoader {
 public:
     explicit AppLoader_NSP(FileSys::VirtualFile file);
-    ~AppLoader_NSP();
+    ~AppLoader_NSP() override;
 
     /**
      * Returns the type of the file
-- 
cgit v1.2.3