Loader: Refactored interface such that data is no longer stored by loader.

NCCH: Removed extra qualification ‘Loader::AppLoader_NCCH::’.

1 files changed, 18 insertions, 20 deletions

diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h
index bf65425a..99753b24 100644
--- a/src/core/loader/ncch.h
+++ b/src/core/loader/ncch.h
@@ -158,38 +158,38 @@ public:
 
     /**
      * Get the code (typically .code section) of the application
-     * @param error ResultStatus result of function
-     * @return Reference to code buffer
+     * @param buffer Reference to buffer to store data
+     * @return ResultStatus result of function
      */
-    const std::vector<u8>& ReadCode(ResultStatus& error);
+    ResultStatus ReadCode(std::vector<u8>& buffer);
 
     /**
      * Get the icon (typically icon section) of the application
-     * @param error ResultStatus result of function
-     * @return Reference to icon buffer
+     * @param buffer Reference to buffer to store data
+     * @return ResultStatus result of function
      */
-    const std::vector<u8>& ReadIcon(ResultStatus& error);
+    ResultStatus ReadIcon(std::vector<u8>& buffer);
 
     /**
      * Get the banner (typically banner section) of the application
-     * @param error ResultStatus result of function
-     * @return Reference to banner buffer
+     * @param buffer Reference to buffer to store data
+     * @return ResultStatus result of function
      */
-    const std::vector<u8>& ReadBanner(ResultStatus& error);
+    ResultStatus ReadBanner(std::vector<u8>& buffer);
 
     /**
      * Get the logo (typically logo section) of the application
-     * @param error ResultStatus result of function
-     * @return Reference to logo buffer
+     * @param buffer Reference to buffer to store data
+     * @return ResultStatus result of function
      */
-    const std::vector<u8>& ReadLogo(ResultStatus& error);
+    ResultStatus ReadLogo(std::vector<u8>& buffer);
 
     /**
-     * Get the RomFs archive of the application
-     * @param error ResultStatus result of function
-     * @return Reference to RomFs archive buffer
+     * Get the RomFS of the application
+     * @param buffer Reference to buffer to store data
+     * @return ResultStatus result of function
      */
-    const std::vector<u8>& ReadRomFS(ResultStatus& error);
+    ResultStatus ReadRomFS(std::vector<u8>& buffer);
 
 private:
 
@@ -197,11 +197,9 @@ private:
      * Reads an application ExeFS section of an NCCH file into AppLoader (e.g. .code, .logo, etc.)
      * @param name Name of section to read out of NCCH file
      * @param buffer Vector to read data into
-     * @param error ResultStatus result of function
-     * @return Reference to buffer of data that was read
+     * @return ResultStatus result of function
      */
-    const std::vector<u8>& LoadSectionExeFS(const char* name, std::vector<u8>& buffer, 
-        ResultStatus& error);
+    ResultStatus LoadSectionExeFS(const char* name, std::vector<u8>& buffer);
 
     /**
      * Loads .code section into memory for booting