diff options
| author |  Yuri Kunde Schlesner | 2015-07-11 19:16:33 -0300 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-07-13 20:00:56 -0300 |
| commit | 2d7299a86fdc4ba2485042f950d864e063be5e97 (patch) | |
| tree | 26c15a7b8fe0563dc39dd80564c30405d458bfe7 /src/core/loader/loader.cpp | |
| parent | FS: Stream RomFS from file instead of loading all of it to memory (diff) | |
| download | yuzu-2d7299a86fdc4ba2485042f950d864e063be5e97.tar.gz yuzu-2d7299a86fdc4ba2485042f950d864e063be5e97.tar.xz yuzu-2d7299a86fdc4ba2485042f950d864e063be5e97.zip | |
Loader: Remove unnecessary pointer indirection to IOFile
Diffstat (limited to 'src/core/loader/loader.cpp')
| -rw-r--r-- | src/core/loader/loader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index b6549daf2..9ef2f8900 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp | |||
| @@ -90,8 +90,8 @@ static const char* GetFileTypeString(FileType type) { | |||
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | ResultStatus LoadFile(const std::string& filename) { | 92 | ResultStatus LoadFile(const std::string& filename) { |
| 93 | std::unique_ptr<FileUtil::IOFile> file(new FileUtil::IOFile(filename, "rb")); | 93 | FileUtil::IOFile file(filename, "rb"); |
| 94 | if (!file->IsOpen()) { | 94 | if (!file.IsOpen()) { |
| 95 | LOG_ERROR(Loader, "Failed to load file %s", filename.c_str()); | 95 | LOG_ERROR(Loader, "Failed to load file %s", filename.c_str()); |
| 96 | return ResultStatus::Error; | 96 | return ResultStatus::Error; |
| 97 | } | 97 | } |
| @@ -99,7 +99,7 @@ ResultStatus LoadFile(const std::string& filename) { | |||
| 99 | std::string filename_filename, filename_extension; | 99 | std::string filename_filename, filename_extension; |
| 100 | Common::SplitPath(filename, nullptr, &filename_filename, &filename_extension); | 100 | Common::SplitPath(filename, nullptr, &filename_filename, &filename_extension); |
| 101 | 101 | ||
| 102 | FileType type = IdentifyFile(*file); | 102 | FileType type = IdentifyFile(file); |
| 103 | FileType filename_type = GuessFromExtension(filename_extension); | 103 | FileType filename_type = GuessFromExtension(filename_extension); |
| 104 | 104 | ||
| 105 | if (type != filename_type) { | 105 | if (type != filename_type) { |