Просмотр исходного кода

loader/nro: Make the static LoadNro function internally linked

This simply acts as a forwarding function for the Load() function, so
this doesn't need to be directly exposed.
Lioncash 7 лет назад
Родитель
Сommit
fc32d6256a
2 измененных файлов с 5 добавлено и 7 удалено
  1. 5 4
      src/core/loader/nro.cpp
  2. 0 3
      src/core/loader/nro.h

+ 5 - 4
src/core/loader/nro.cpp

@@ -128,8 +128,8 @@ static constexpr u32 PageAlignSize(u32 size) {
     return (size + Memory::PAGE_MASK) & ~Memory::PAGE_MASK;
     return (size + Memory::PAGE_MASK) & ~Memory::PAGE_MASK;
 }
 }
 
 
-/*static*/ bool AppLoader_NRO::LoadNro(Kernel::Process& process, const std::vector<u8>& data,
-                                       const std::string& name, VAddr load_base) {
+static bool LoadNroImpl(Kernel::Process& process, const std::vector<u8>& data,
+                        const std::string& name, VAddr load_base) {
     if (data.size() < sizeof(NroHeader)) {
     if (data.size() < sizeof(NroHeader)) {
         return {};
         return {};
     }
     }
@@ -195,8 +195,9 @@ static constexpr u32 PageAlignSize(u32 size) {
     return true;
     return true;
 }
 }
 
 
-bool AppLoader_NRO::LoadNro(Kernel::Process& process, const FileSys::VfsFile& file, VAddr load_base) {
-    return LoadNro(process, file.ReadAllBytes(), file.GetName(), load_base);
+bool AppLoader_NRO::LoadNro(Kernel::Process& process, const FileSys::VfsFile& file,
+                            VAddr load_base) {
+    return LoadNroImpl(process, file.ReadAllBytes(), file.GetName(), load_base);
 }
 }
 
 
 ResultStatus AppLoader_NRO::Load(Kernel::Process& process) {
 ResultStatus AppLoader_NRO::Load(Kernel::Process& process) {

+ 0 - 3
src/core/loader/nro.h

@@ -45,9 +45,6 @@ public:
     ResultStatus ReadTitle(std::string& title) override;
     ResultStatus ReadTitle(std::string& title) override;
     bool IsRomFSUpdatable() const override;
     bool IsRomFSUpdatable() const override;
 
 
-    static bool LoadNro(Kernel::Process& process, const std::vector<u8>& data,
-                        const std::string& name, VAddr load_base);
-
 private:
 private:
     bool LoadNro(Kernel::Process& process, const FileSys::VfsFile& file, VAddr load_base);
     bool LoadNro(Kernel::Process& process, const FileSys::VfsFile& file, VAddr load_base);