summaryrefslogtreecommitdiff
path: root/src/core/file_sys
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-06-02 15:29:09 -0700
committerGitHub <noreply@github.com>2021-06-02 15:29:09 -0700
commit4ea171fa5e50723d50b57b26aaaca2fac30eea57 (patch)
treeef2f0869252f59b0b8aeb62a48e2a233c0f94664 /src/core/file_sys
parentd6006e9a3f0ea2b9fca17174542b5aba131dd294 (diff)
parenta0e4c2e1fc8d3ce33948a0ec6a840960f1ceb484 (diff)
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.cpp6
-rw-r--r--src/core/file_sys/savedata_factory.cpp4
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
if (nca == nullptr) {
// TODO: Find the right error code to use here
- return RESULT_UNKNOWN;
+ return ResultUnknown;
}
const PatchManager patch_manager{title_id, filesystem_controller, content_provider};
@@ -74,13 +74,13 @@ ResultVal<VirtualFile> RomFSFactory::Open(u64 title_id, StorageId storage,
const std::shared_ptr<NCA> res = GetEntry(title_id, storage, type);
if (res == nullptr) {
// TODO(DarkLordZach): Find the right error code to use here
- return RESULT_UNKNOWN;
+ return ResultUnknown;
}
const auto romfs = res->GetRomFS();
if (romfs == nullptr) {
// TODO(DarkLordZach): Find the right error code to use here
- return RESULT_UNKNOWN;
+ return ResultUnknown;
}
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,
// Return an error if the save data doesn't actually exist.
if (out == nullptr) {
// TODO(DarkLordZach): Find out correct error code.
- return RESULT_UNKNOWN;
+ return ResultUnknown;
}
return MakeResult<VirtualDir>(std::move(out));
@@ -112,7 +112,7 @@ ResultVal<VirtualDir> SaveDataFactory::Open(SaveDataSpaceId space,
// Return an error if the save data doesn't actually exist.
if (out == nullptr) {
// TODO(Subv): Find out correct error code.
- return RESULT_UNKNOWN;
+ return ResultUnknown;
}
return MakeResult<VirtualDir>(std::move(out));