diff options
| -rw-r--r-- | src/core/loader/nro.cpp | 9 | ||||
| -rw-r--r-- | src/core/loader/nro.h | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 16d5883ee..4fad0c0dd 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp @@ -128,8 +128,8 @@ static constexpr u32 PageAlignSize(u32 size) { 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)) { return {}; } @@ -195,8 +195,9 @@ static constexpr u32 PageAlignSize(u32 size) { 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) { diff --git a/src/core/loader/nro.h b/src/core/loader/nro.h index 6a63d1a7a..6deff3a51 100644 --- a/src/core/loader/nro.h +++ b/src/core/loader/nro.h @@ -45,9 +45,6 @@ public: ResultStatus ReadTitle(std::string& title) override; bool IsRomFSUpdatable() const override; - static bool LoadNro(Kernel::Process& process, const std::vector<u8>& data, - const std::string& name, VAddr load_base); - private: bool LoadNro(Kernel::Process& process, const FileSys::VfsFile& file, VAddr load_base); |