From fc32d6256adb479e3e990a0f3221d02ef09b1744 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sun, 2 Dec 2018 22:17:09 -0500
Subject: [PATCH] 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.
---
src/core/loader/nro.cpp | 9 +++++----
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 16d5883ee2..4fad0c0dd2 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 6a63d1a7ad..6deff3a51e 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);
--
GitLab