diff options
| author | 2021-06-02 15:29:09 -0700 | |
|---|---|---|
| committer | 2021-06-02 15:29:09 -0700 | |
| commit | 4ea171fa5e50723d50b57b26aaaca2fac30eea57 (patch) | |
| tree | ef2f0869252f59b0b8aeb62a48e2a233c0f94664 /src/core/file_sys | |
| parent | Merge pull request #6403 from Kewlan/game-list-for-loop-optimization (diff) | |
| parent | general: Replace RESULT_UNKNOWN with ResultUnknown (diff) | |
| download | yuzu-4ea171fa5e50723d50b57b26aaaca2fac30eea57.tar.gz yuzu-4ea171fa5e50723d50b57b26aaaca2fac30eea57.tar.xz yuzu-4ea171fa5e50723d50b57b26aaaca2fac30eea57.zip | |
Merge pull request #6308 from Morph1984/result
general: Replace RESULT_NAME with ResultName
Diffstat (limited to 'src/core/file_sys')
| -rw-r--r-- | src/core/file_sys/romfs_factory.cpp | 6 | ||||
| -rw-r--r-- | src/core/file_sys/savedata_factory.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/file_sys/romfs_factory.cpp b/src/core/file_sys/romfs_factory.cpp index aa7f3072f..638c6cea8 100644 --- a/src/core/file_sys/romfs_factory.cpp +++ b/src/core/file_sys/romfs_factory.cpp | |||
| @@ -53,7 +53,7 @@ ResultVal<VirtualFile> RomFSFactory::OpenPatchedRomFS(u64 title_id, ContentRecor | |||
| 53 | 53 | ||
| 54 | if (nca == nullptr) { | 54 | if (nca == nullptr) { |
| 55 | // TODO: Find the right error code to use here | 55 | // TODO: Find the right error code to use here |
| 56 | return RESULT_UNKNOWN; | 56 | return ResultUnknown; |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | const PatchManager patch_manager{title_id, filesystem_controller, content_provider}; | 59 | const PatchManager patch_manager{title_id, filesystem_controller, content_provider}; |
| @@ -74,13 +74,13 @@ ResultVal<VirtualFile> RomFSFactory::Open(u64 title_id, StorageId storage, | |||
| 74 | const std::shared_ptr<NCA> res = GetEntry(title_id, storage, type); | 74 | const std::shared_ptr<NCA> res = GetEntry(title_id, storage, type); |
| 75 | if (res == nullptr) { | 75 | if (res == nullptr) { |
| 76 | // TODO(DarkLordZach): Find the right error code to use here | 76 | // TODO(DarkLordZach): Find the right error code to use here |
| 77 | return RESULT_UNKNOWN; | 77 | return ResultUnknown; |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | const auto romfs = res->GetRomFS(); | 80 | const auto romfs = res->GetRomFS(); |
| 81 | if (romfs == nullptr) { | 81 | if (romfs == nullptr) { |
| 82 | // TODO(DarkLordZach): Find the right error code to use here | 82 | // TODO(DarkLordZach): Find the right error code to use here |
| 83 | return RESULT_UNKNOWN; | 83 | return ResultUnknown; |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | return MakeResult<VirtualFile>(romfs); | 86 | return MakeResult<VirtualFile>(romfs); |
diff --git a/src/core/file_sys/savedata_factory.cpp b/src/core/file_sys/savedata_factory.cpp index f973d1d21..6c3685927 100644 --- a/src/core/file_sys/savedata_factory.cpp +++ b/src/core/file_sys/savedata_factory.cpp | |||
| @@ -91,7 +91,7 @@ ResultVal<VirtualDir> SaveDataFactory::Create(SaveDataSpaceId space, | |||
| 91 | // Return an error if the save data doesn't actually exist. | 91 | // Return an error if the save data doesn't actually exist. |
| 92 | if (out == nullptr) { | 92 | if (out == nullptr) { |
| 93 | // TODO(DarkLordZach): Find out correct error code. | 93 | // TODO(DarkLordZach): Find out correct error code. |
| 94 | return RESULT_UNKNOWN; | 94 | return ResultUnknown; |
| 95 | } | 95 | } |
| 96 | 96 | ||
| 97 | return MakeResult<VirtualDir>(std::move(out)); | 97 | return MakeResult<VirtualDir>(std::move(out)); |
| @@ -112,7 +112,7 @@ ResultVal<VirtualDir> SaveDataFactory::Open(SaveDataSpaceId space, | |||
| 112 | // Return an error if the save data doesn't actually exist. | 112 | // Return an error if the save data doesn't actually exist. |
| 113 | if (out == nullptr) { | 113 | if (out == nullptr) { |
| 114 | // TODO(Subv): Find out correct error code. | 114 | // TODO(Subv): Find out correct error code. |
| 115 | return RESULT_UNKNOWN; | 115 | return ResultUnknown; |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | return MakeResult<VirtualDir>(std::move(out)); | 118 | return MakeResult<VirtualDir>(std::move(out)); |