yuzu-emu/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-11-27 21:54:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

loader/nro: Make the static LoadNro function internally linked

Browse Source 
This simply acts as a forwarding function for the Load() function, so
this doesn't need to be directly exposed.
This commit is contained in:
Lioncash 2018-12-02 22:17:09 -05:00
parent b110d2176c
commit fc32d6256a
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/loader/nro.cpp
View File

@ -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, static bool LoadNroImpl(Kernel::Process& process, const std::vector<u8>& data,
const std::string& name, VAddr load_base) { 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) { bool AppLoader_NRO::LoadNro(Kernel::Process& process, const FileSys::VfsFile& file,
return LoadNro(process, file.ReadAllBytes(), file.GetName(), load_base); 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) {

3
src/core/loader/nro.h
View File

@ -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);