summaryrefslogtreecommitdiffstats
path: root/src/core/loader
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2014-09-12 00:17:15 +0200
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2014-09-17 16:35:45 +0200
commit6b7b36a8745ddfd0e24fa51ef74dbc3058b3dacc (patch)
treedd5cdcd8b1f9822a019362b44a44ec9505adff8a /src/core/loader
parentCommon: Return the number of items read/written in IOFile’s methods instead of a boolean. (diff)
downloadyuzu-6b7b36a8745ddfd0e24fa51ef74dbc3058b3dacc.tar
yuzu-6b7b36a8745ddfd0e24fa51ef74dbc3058b3dacc.tar.gz
yuzu-6b7b36a8745ddfd0e24fa51ef74dbc3058b3dacc.tar.bz2
yuzu-6b7b36a8745ddfd0e24fa51ef74dbc3058b3dacc.tar.lz
yuzu-6b7b36a8745ddfd0e24fa51ef74dbc3058b3dacc.tar.xz
yuzu-6b7b36a8745ddfd0e24fa51ef74dbc3058b3dacc.tar.zst
yuzu-6b7b36a8745ddfd0e24fa51ef74dbc3058b3dacc.zip
Diffstat (limited to 'src/core/loader')
-rw-r--r--src/core/loader/elf.cpp2
-rw-r--r--src/core/loader/loader.cpp2
-rw-r--r--src/core/loader/ncch.cpp6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index 76c9d6d54..389d5a8c9 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -351,7 +351,7 @@ ResultStatus AppLoader_ELF::Load() {
if (is_loaded)
return ResultStatus::ErrorAlreadyLoaded;
- File::IOFile file(filename, "rb");
+ FileUtil::IOFile file(filename, "rb");
if (file.IsOpen()) {
u32 size = (u32)file.GetSize();
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 577a2297a..a268e021a 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -78,7 +78,7 @@ ResultStatus LoadFile(const std::string& filename) {
{
INFO_LOG(LOADER, "Loading BIN file %s...", filename.c_str());
- File::IOFile file(filename, "rb");
+ FileUtil::IOFile file(filename, "rb");
if (file.IsOpen()) {
file.ReadBytes(Memory::GetPointer(Memory::EXEFS_CODE_VADDR), (size_t)file.GetSize());
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index 9af59e419..1e5501e6d 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -138,7 +138,7 @@ ResultStatus AppLoader_NCCH::LoadExec() const {
*/
ResultStatus AppLoader_NCCH::LoadSectionExeFS(const char* name, std::vector<u8>& buffer) const {
// Iterate through the ExeFs archive until we find the .code file...
- File::IOFile file(filename, "rb");
+ FileUtil::IOFile file(filename, "rb");
if (file.IsOpen()) {
for (int i = 0; i < kMaxSections; i++) {
// Load the specified section...
@@ -199,7 +199,7 @@ ResultStatus AppLoader_NCCH::Load() {
if (is_loaded)
return ResultStatus::ErrorAlreadyLoaded;
- File::IOFile file(filename, "rb");
+ FileUtil::IOFile file(filename, "rb");
if (file.IsOpen()) {
file.ReadBytes(&ncch_header, sizeof(NCCH_Header));
@@ -290,7 +290,7 @@ ResultStatus AppLoader_NCCH::ReadLogo(std::vector<u8>& buffer) const {
* @return ResultStatus result of function
*/
ResultStatus AppLoader_NCCH::ReadRomFS(std::vector<u8>& buffer) const {
- File::IOFile file(filename, "rb");
+ FileUtil::IOFile file(filename, "rb");
if (file.IsOpen()) {
// Check if the NCCH has a RomFS...
if (ncch_header.romfs_offset != 0 && ncch_header.romfs_size != 0) {