summaryrefslogtreecommitdiff
path: root/src/core/loader/kip.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2021-04-27 12:05:34 -0400
committerGravatar Lioncash2021-04-27 12:48:15 -0400
commit724c19a307f31ce1122fb8047c86d5a126d0860f (patch)
tree605b89f42d7897aac46f06add54c34201d9354bd /src/core/loader/kip.cpp
parentMerge pull request #6246 from lioncash/shadow (diff)
downloadyuzu-724c19a307f31ce1122fb8047c86d5a126d0860f.tar.gz
yuzu-724c19a307f31ce1122fb8047c86d5a126d0860f.tar.xz
yuzu-724c19a307f31ce1122fb8047c86d5a126d0860f.zip
loader: Resolve instances of variable shadowing
Eliminates variable shadowing cases across all the loaders to bring us closer to enabling variable shadowing as an error in core.
Diffstat (limited to 'src/core/loader/kip.cpp')
-rw-r--r--src/core/loader/kip.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/loader/kip.cpp b/src/core/loader/kip.cpp
index 55e6de794..9b447da2a 100644
--- a/src/core/loader/kip.cpp
+++ b/src/core/loader/kip.cpp
@@ -24,9 +24,9 @@ AppLoader_KIP::AppLoader_KIP(FileSys::VirtualFile file_)
24 24
25AppLoader_KIP::~AppLoader_KIP() = default; 25AppLoader_KIP::~AppLoader_KIP() = default;
26 26
27FileType AppLoader_KIP::IdentifyType(const FileSys::VirtualFile& file) { 27FileType AppLoader_KIP::IdentifyType(const FileSys::VirtualFile& in_file) {
28 u32_le magic{}; 28 u32_le magic{};
29 if (file->GetSize() < sizeof(u32) || file->ReadObject(&magic) != sizeof(u32)) { 29 if (in_file->GetSize() < sizeof(u32) || in_file->ReadObject(&magic) != sizeof(u32)) {
30 return FileType::Error; 30 return FileType::Error;
31 } 31 }
32 32
@@ -56,10 +56,10 @@ AppLoader::LoadResult AppLoader_KIP::Load(Kernel::Process& process,
56 return {kip->GetStatus(), {}}; 56 return {kip->GetStatus(), {}};
57 } 57 }
58 58
59 const auto get_kip_address_space_type = [](const auto& kip) { 59 const auto get_kip_address_space_type = [](const auto& kip_type) {
60 return kip.Is64Bit() 60 return kip_type.Is64Bit()
61 ? (kip.Is39BitAddressSpace() ? FileSys::ProgramAddressSpaceType::Is39Bit 61 ? (kip_type.Is39BitAddressSpace() ? FileSys::ProgramAddressSpaceType::Is39Bit
62 : FileSys::ProgramAddressSpaceType::Is36Bit) 62 : FileSys::ProgramAddressSpaceType::Is36Bit)
63 : FileSys::ProgramAddressSpaceType::Is32Bit; 63 : FileSys::ProgramAddressSpaceType::Is32Bit;
64 }; 64 };
65 65