diff options
author | Zach Hilman <DarkLordZach@users.noreply.github.com> | 2018-07-17 21:42:15 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2018-07-17 21:42:15 +0200 |
commit | 69bfe075b5c3f6b17ce269950d1f8c9aab18e2de (patch) | |
tree | 8fca65bb5b3a0a8fb2b0772020d5b8d47749c3b3 /src/core/loader | |
parent | Merge pull request #671 from MerryMage/clear-exclusive-state (diff) | |
download | yuzu-69bfe075b5c3f6b17ce269950d1f8c9aab18e2de.tar yuzu-69bfe075b5c3f6b17ce269950d1f8c9aab18e2de.tar.gz yuzu-69bfe075b5c3f6b17ce269950d1f8c9aab18e2de.tar.bz2 yuzu-69bfe075b5c3f6b17ce269950d1f8c9aab18e2de.tar.lz yuzu-69bfe075b5c3f6b17ce269950d1f8c9aab18e2de.tar.xz yuzu-69bfe075b5c3f6b17ce269950d1f8c9aab18e2de.tar.zst yuzu-69bfe075b5c3f6b17ce269950d1f8c9aab18e2de.zip |
Diffstat (limited to 'src/core/loader')
-rw-r--r-- | src/core/loader/deconstructed_rom_directory.cpp | 3 | ||||
-rw-r--r-- | src/core/loader/nca.cpp | 3 | ||||
-rw-r--r-- | src/core/loader/nso.cpp | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp index 5fdb1d289..0b11bf4f3 100644 --- a/src/core/loader/deconstructed_rom_directory.cpp +++ b/src/core/loader/deconstructed_rom_directory.cpp @@ -154,8 +154,7 @@ ResultStatus AppLoader_DeconstructedRomDirectory::Load( // Register the RomFS if a ".romfs" file was found if (!filepath_romfs.empty()) { - Service::FileSystem::RegisterFileSystem(std::make_unique<FileSys::RomFS_Factory>(*this), - Service::FileSystem::Type::RomFS); + Service::FileSystem::RegisterRomFS(std::make_unique<FileSys::RomFSFactory>(*this)); } is_loaded = true; diff --git a/src/core/loader/nca.cpp b/src/core/loader/nca.cpp index 0fd930ae2..b463f369c 100644 --- a/src/core/loader/nca.cpp +++ b/src/core/loader/nca.cpp @@ -277,8 +277,7 @@ ResultStatus AppLoader_NCA::Load(Kernel::SharedPtr<Kernel::Process>& process) { metadata.GetMainThreadStackSize()); if (nca->GetRomFsSize() > 0) - Service::FileSystem::RegisterFileSystem(std::make_unique<FileSys::RomFS_Factory>(*this), - Service::FileSystem::Type::RomFS); + Service::FileSystem::RegisterRomFS(std::make_unique<FileSys::RomFSFactory>(*this)); is_loaded = true; return ResultStatus::Success; diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index 1c629e21f..7b3d6b837 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp @@ -115,7 +115,7 @@ VAddr AppLoader_NSO::LoadModule(const std::string& name, const std::vector<u8>& std::vector<u8> program_image; for (int i = 0; i < nso_header.segments.size(); ++i) { std::vector<u8> compressed_data(nso_header.segments_compressed_size[i]); - for (int j = 0; j < nso_header.segments_compressed_size[i]; ++j) + for (auto j = 0; j < nso_header.segments_compressed_size[i]; ++j) compressed_data[j] = file_data[nso_header.segments[i].offset + j]; std::vector<u8> data = DecompressSegment(compressed_data, nso_header.segments[i]); program_image.resize(nso_header.segments[i].location); |