diff options
| author | bunnei <bunneidev@gmail.com> | 2021-04-27 19:40:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 19:40:46 -0700 |
| commit | b096ec68cdbf6f1064a8b6b855489d38c3e59f6a (patch) | |
| tree | 605b89f42d7897aac46f06add54c34201d9354bd /src/core/loader/nax.cpp | |
| parent | cd80471c902540ae1086732234d45b6fb5b2e169 (diff) | |
| parent | 724c19a307f31ce1122fb8047c86d5a126d0860f (diff) | |
Merge pull request #6250 from lioncash/loader-shadow
loader: Resolve instances of variable shadowing
Diffstat (limited to 'src/core/loader/nax.cpp')
| -rw-r--r-- | src/core/loader/nax.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/core/loader/nax.cpp b/src/core/loader/nax.cpp index 49028177bc..f53c3a72c6 100644 --- a/src/core/loader/nax.cpp +++ b/src/core/loader/nax.cpp @@ -26,14 +26,14 @@ FileType IdentifyTypeImpl(const FileSys::NAX& nax) { } } // Anonymous namespace -AppLoader_NAX::AppLoader_NAX(FileSys::VirtualFile file) - : AppLoader(file), nax(std::make_unique<FileSys::NAX>(file)), +AppLoader_NAX::AppLoader_NAX(FileSys::VirtualFile file_) + : AppLoader(file_), nax(std::make_unique<FileSys::NAX>(file_)), nca_loader(std::make_unique<AppLoader_NCA>(nax->GetDecrypted())) {} AppLoader_NAX::~AppLoader_NAX() = default; -FileType AppLoader_NAX::IdentifyType(const FileSys::VirtualFile& file) { - const FileSys::NAX nax(file); +FileType AppLoader_NAX::IdentifyType(const FileSys::VirtualFile& nax_file) { + const FileSys::NAX nax(nax_file); return IdentifyTypeImpl(nax); } @@ -41,8 +41,7 @@ FileType AppLoader_NAX::GetFileType() const { return IdentifyTypeImpl(*nax); } -AppLoader_NAX::LoadResult AppLoader_NAX::Load(Kernel::Process& process, - [[maybe_unused]] Core::System& system) { +AppLoader_NAX::LoadResult AppLoader_NAX::Load(Kernel::Process& process, Core::System& system) { if (is_loaded) { return {ResultStatus::ErrorAlreadyLoaded, {}}; } |