diff options
| author | 2021-05-21 01:06:31 -0400 | |
|---|---|---|
| committer | 2021-06-02 00:39:27 -0400 | |
| commit | a0e4c2e1fc8d3ce33948a0ec6a840960f1ceb484 (patch) | |
| tree | 7d6a0f2189410ff77f9e768704abcfea9ef34f3b | |
| parent | general: Replace RESULT_SUCCESS with ResultSuccess (diff) | |
| download | yuzu-a0e4c2e1fc8d3ce33948a0ec6a840960f1ceb484.tar.gz yuzu-a0e4c2e1fc8d3ce33948a0ec6a840960f1ceb484.tar.xz yuzu-a0e4c2e1fc8d3ce33948a0ec6a840960f1ceb484.zip | |
general: Replace RESULT_UNKNOWN with ResultUnknown
Transition to PascalCase for result names.
| -rw-r--r-- | src/core/file_sys/romfs_factory.cpp | 6 | ||||
| -rw-r--r-- | src/core/file_sys/savedata_factory.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/k_address_arbiter.h | 4 | ||||
| -rw-r--r-- | src/core/hle/result.h | 4 | ||||
| -rw-r--r-- | src/core/hle/service/acc/acc.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/am/am.cpp | 12 | ||||
| -rw-r--r-- | src/core/hle/service/aoc/aoc_u.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/audio/hwopus.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/bcat/backend/boxcat.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/filesystem/filesystem.cpp | 30 | ||||
| -rw-r--r-- | src/core/hle/service/filesystem/fsp_srv.cpp | 8 | ||||
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/ns/ns.cpp | 4 |
13 files changed, 45 insertions, 45 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)); |
diff --git a/src/core/hle/kernel/k_address_arbiter.h b/src/core/hle/kernel/k_address_arbiter.h index 8d379b524..bf8b46665 100644 --- a/src/core/hle/kernel/k_address_arbiter.h +++ b/src/core/hle/kernel/k_address_arbiter.h | |||
| @@ -37,7 +37,7 @@ public: | |||
| 37 | return SignalAndModifyByWaitingCountIfEqual(addr, value, count); | 37 | return SignalAndModifyByWaitingCountIfEqual(addr, value, count); |
| 38 | } | 38 | } |
| 39 | UNREACHABLE(); | 39 | UNREACHABLE(); |
| 40 | return RESULT_UNKNOWN; | 40 | return ResultUnknown; |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | [[nodiscard]] ResultCode WaitForAddress(VAddr addr, Svc::ArbitrationType type, s32 value, | 43 | [[nodiscard]] ResultCode WaitForAddress(VAddr addr, Svc::ArbitrationType type, s32 value, |
| @@ -51,7 +51,7 @@ public: | |||
| 51 | return WaitIfEqual(addr, value, timeout); | 51 | return WaitIfEqual(addr, value, timeout); |
| 52 | } | 52 | } |
| 53 | UNREACHABLE(); | 53 | UNREACHABLE(); |
| 54 | return RESULT_UNKNOWN; | 54 | return ResultUnknown; |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | private: | 57 | private: |
diff --git a/src/core/hle/result.h b/src/core/hle/result.h index 9ec124cf4..605236552 100644 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h | |||
| @@ -152,7 +152,7 @@ constexpr ResultCode ResultSuccess(0); | |||
| 152 | * @note This should only be used when a particular error code | 152 | * @note This should only be used when a particular error code |
| 153 | * is not known yet. | 153 | * is not known yet. |
| 154 | */ | 154 | */ |
| 155 | constexpr ResultCode RESULT_UNKNOWN(UINT32_MAX); | 155 | constexpr ResultCode ResultUnknown(UINT32_MAX); |
| 156 | 156 | ||
| 157 | /** | 157 | /** |
| 158 | * This is an optional value type. It holds a `ResultCode` and, if that code is a success code, | 158 | * This is an optional value type. It holds a `ResultCode` and, if that code is a success code, |
| @@ -191,7 +191,7 @@ class ResultVal { | |||
| 191 | public: | 191 | public: |
| 192 | /// Constructs an empty `ResultVal` with the given error code. The code must not be a success | 192 | /// Constructs an empty `ResultVal` with the given error code. The code must not be a success |
| 193 | /// code. | 193 | /// code. |
| 194 | ResultVal(ResultCode error_code = RESULT_UNKNOWN) : result_code(error_code) { | 194 | ResultVal(ResultCode error_code = ResultUnknown) : result_code(error_code) { |
| 195 | ASSERT(error_code.IsError()); | 195 | ASSERT(error_code.IsError()); |
| 196 | } | 196 | } |
| 197 | 197 | ||
diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index ecf815484..d1c1fb71d 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp | |||
| @@ -304,7 +304,7 @@ protected: | |||
| 304 | LOG_ERROR(Service_ACC, "Failed to get profile base and data for user={}", | 304 | LOG_ERROR(Service_ACC, "Failed to get profile base and data for user={}", |
| 305 | user_id.Format()); | 305 | user_id.Format()); |
| 306 | IPC::ResponseBuilder rb{ctx, 2}; | 306 | IPC::ResponseBuilder rb{ctx, 2}; |
| 307 | rb.Push(RESULT_UNKNOWN); // TODO(ogniK): Get actual error code | 307 | rb.Push(ResultUnknown); // TODO(ogniK): Get actual error code |
| 308 | } | 308 | } |
| 309 | } | 309 | } |
| 310 | 310 | ||
| @@ -318,7 +318,7 @@ protected: | |||
| 318 | } else { | 318 | } else { |
| 319 | LOG_ERROR(Service_ACC, "Failed to get profile base for user={}", user_id.Format()); | 319 | LOG_ERROR(Service_ACC, "Failed to get profile base for user={}", user_id.Format()); |
| 320 | IPC::ResponseBuilder rb{ctx, 2}; | 320 | IPC::ResponseBuilder rb{ctx, 2}; |
| 321 | rb.Push(RESULT_UNKNOWN); // TODO(ogniK): Get actual error code | 321 | rb.Push(ResultUnknown); // TODO(ogniK): Get actual error code |
| 322 | } | 322 | } |
| 323 | } | 323 | } |
| 324 | 324 | ||
| @@ -903,7 +903,7 @@ void Module::Interface::TrySelectUserWithoutInteraction(Kernel::HLERequestContex | |||
| 903 | const auto user_list = profile_manager->GetAllUsers(); | 903 | const auto user_list = profile_manager->GetAllUsers(); |
| 904 | if (std::all_of(user_list.begin(), user_list.end(), | 904 | if (std::all_of(user_list.begin(), user_list.end(), |
| 905 | [](const auto& user) { return user.uuid == Common::INVALID_UUID; })) { | 905 | [](const auto& user) { return user.uuid == Common::INVALID_UUID; })) { |
| 906 | rb.Push(RESULT_UNKNOWN); // TODO(ogniK): Find the correct error code | 906 | rb.Push(ResultUnknown); // TODO(ogniK): Find the correct error code |
| 907 | rb.PushRaw<u128>(Common::INVALID_UUID); | 907 | rb.PushRaw<u128>(Common::INVALID_UUID); |
| 908 | return; | 908 | return; |
| 909 | } | 909 | } |
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 3a44fdeaf..b578153d3 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp | |||
| @@ -1162,7 +1162,7 @@ void ILibraryAppletCreator::CreateLibraryApplet(Kernel::HLERequestContext& ctx) | |||
| 1162 | LOG_ERROR(Service_AM, "Applet doesn't exist! applet_id={}", applet_id); | 1162 | LOG_ERROR(Service_AM, "Applet doesn't exist! applet_id={}", applet_id); |
| 1163 | 1163 | ||
| 1164 | IPC::ResponseBuilder rb{ctx, 2}; | 1164 | IPC::ResponseBuilder rb{ctx, 2}; |
| 1165 | rb.Push(RESULT_UNKNOWN); | 1165 | rb.Push(ResultUnknown); |
| 1166 | return; | 1166 | return; |
| 1167 | } | 1167 | } |
| 1168 | 1168 | ||
| @@ -1182,7 +1182,7 @@ void ILibraryAppletCreator::CreateStorage(Kernel::HLERequestContext& ctx) { | |||
| 1182 | if (size <= 0) { | 1182 | if (size <= 0) { |
| 1183 | LOG_ERROR(Service_AM, "size is less than or equal to 0"); | 1183 | LOG_ERROR(Service_AM, "size is less than or equal to 0"); |
| 1184 | IPC::ResponseBuilder rb{ctx, 2}; | 1184 | IPC::ResponseBuilder rb{ctx, 2}; |
| 1185 | rb.Push(RESULT_UNKNOWN); | 1185 | rb.Push(ResultUnknown); |
| 1186 | return; | 1186 | return; |
| 1187 | } | 1187 | } |
| 1188 | 1188 | ||
| @@ -1210,7 +1210,7 @@ void ILibraryAppletCreator::CreateTransferMemoryStorage(Kernel::HLERequestContex | |||
| 1210 | if (parameters.size <= 0) { | 1210 | if (parameters.size <= 0) { |
| 1211 | LOG_ERROR(Service_AM, "size is less than or equal to 0"); | 1211 | LOG_ERROR(Service_AM, "size is less than or equal to 0"); |
| 1212 | IPC::ResponseBuilder rb{ctx, 2}; | 1212 | IPC::ResponseBuilder rb{ctx, 2}; |
| 1213 | rb.Push(RESULT_UNKNOWN); | 1213 | rb.Push(ResultUnknown); |
| 1214 | return; | 1214 | return; |
| 1215 | } | 1215 | } |
| 1216 | 1216 | ||
| @@ -1220,7 +1220,7 @@ void ILibraryAppletCreator::CreateTransferMemoryStorage(Kernel::HLERequestContex | |||
| 1220 | if (transfer_mem.IsNull()) { | 1220 | if (transfer_mem.IsNull()) { |
| 1221 | LOG_ERROR(Service_AM, "transfer_mem is a nullptr for handle={:08X}", handle); | 1221 | LOG_ERROR(Service_AM, "transfer_mem is a nullptr for handle={:08X}", handle); |
| 1222 | IPC::ResponseBuilder rb{ctx, 2}; | 1222 | IPC::ResponseBuilder rb{ctx, 2}; |
| 1223 | rb.Push(RESULT_UNKNOWN); | 1223 | rb.Push(ResultUnknown); |
| 1224 | return; | 1224 | return; |
| 1225 | } | 1225 | } |
| 1226 | 1226 | ||
| @@ -1244,7 +1244,7 @@ void ILibraryAppletCreator::CreateHandleStorage(Kernel::HLERequestContext& ctx) | |||
| 1244 | if (size <= 0) { | 1244 | if (size <= 0) { |
| 1245 | LOG_ERROR(Service_AM, "size is less than or equal to 0"); | 1245 | LOG_ERROR(Service_AM, "size is less than or equal to 0"); |
| 1246 | IPC::ResponseBuilder rb{ctx, 2}; | 1246 | IPC::ResponseBuilder rb{ctx, 2}; |
| 1247 | rb.Push(RESULT_UNKNOWN); | 1247 | rb.Push(ResultUnknown); |
| 1248 | return; | 1248 | return; |
| 1249 | } | 1249 | } |
| 1250 | 1250 | ||
| @@ -1254,7 +1254,7 @@ void ILibraryAppletCreator::CreateHandleStorage(Kernel::HLERequestContext& ctx) | |||
| 1254 | if (transfer_mem.IsNull()) { | 1254 | if (transfer_mem.IsNull()) { |
| 1255 | LOG_ERROR(Service_AM, "transfer_mem is a nullptr for handle={:08X}", handle); | 1255 | LOG_ERROR(Service_AM, "transfer_mem is a nullptr for handle={:08X}", handle); |
| 1256 | IPC::ResponseBuilder rb{ctx, 2}; | 1256 | IPC::ResponseBuilder rb{ctx, 2}; |
| 1257 | rb.Push(RESULT_UNKNOWN); | 1257 | rb.Push(ResultUnknown); |
| 1258 | return; | 1258 | return; |
| 1259 | } | 1259 | } |
| 1260 | 1260 | ||
diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/aoc_u.cpp index 67787496a..fec704c65 100644 --- a/src/core/hle/service/aoc/aoc_u.cpp +++ b/src/core/hle/service/aoc/aoc_u.cpp | |||
| @@ -190,7 +190,7 @@ void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) { | |||
| 190 | if (out.size() < offset) { | 190 | if (out.size() < offset) { |
| 191 | IPC::ResponseBuilder rb{ctx, 2}; | 191 | IPC::ResponseBuilder rb{ctx, 2}; |
| 192 | // TODO(DarkLordZach): Find the correct error code. | 192 | // TODO(DarkLordZach): Find the correct error code. |
| 193 | rb.Push(RESULT_UNKNOWN); | 193 | rb.Push(ResultUnknown); |
| 194 | return; | 194 | return; |
| 195 | } | 195 | } |
| 196 | 196 | ||
diff --git a/src/core/hle/service/audio/hwopus.cpp b/src/core/hle/service/audio/hwopus.cpp index 4e534edac..10e6f7a64 100644 --- a/src/core/hle/service/audio/hwopus.cpp +++ b/src/core/hle/service/audio/hwopus.cpp | |||
| @@ -80,7 +80,7 @@ private: | |||
| 80 | LOG_ERROR(Audio, "Failed to decode opus data"); | 80 | LOG_ERROR(Audio, "Failed to decode opus data"); |
| 81 | IPC::ResponseBuilder rb{ctx, 2}; | 81 | IPC::ResponseBuilder rb{ctx, 2}; |
| 82 | // TODO(ogniK): Use correct error code | 82 | // TODO(ogniK): Use correct error code |
| 83 | rb.Push(RESULT_UNKNOWN); | 83 | rb.Push(ResultUnknown); |
| 84 | return; | 84 | return; |
| 85 | } | 85 | } |
| 86 | 86 | ||
| @@ -281,7 +281,7 @@ void HwOpus::OpenOpusDecoder(Kernel::HLERequestContext& ctx) { | |||
| 281 | LOG_ERROR(Audio, "Failed to create Opus decoder (error={}).", error); | 281 | LOG_ERROR(Audio, "Failed to create Opus decoder (error={}).", error); |
| 282 | IPC::ResponseBuilder rb{ctx, 2}; | 282 | IPC::ResponseBuilder rb{ctx, 2}; |
| 283 | // TODO(ogniK): Use correct error code | 283 | // TODO(ogniK): Use correct error code |
| 284 | rb.Push(RESULT_UNKNOWN); | 284 | rb.Push(ResultUnknown); |
| 285 | return; | 285 | return; |
| 286 | } | 286 | } |
| 287 | 287 | ||
diff --git a/src/core/hle/service/bcat/backend/boxcat.cpp b/src/core/hle/service/bcat/backend/boxcat.cpp index 24bc3a670..d9fdc2dca 100644 --- a/src/core/hle/service/bcat/backend/boxcat.cpp +++ b/src/core/hle/service/bcat/backend/boxcat.cpp | |||
| @@ -121,7 +121,7 @@ void HandleDownloadDisplayResult(const AM::Applets::AppletManager& applet_manage | |||
| 121 | 121 | ||
| 122 | const auto& frontend{applet_manager.GetAppletFrontendSet()}; | 122 | const auto& frontend{applet_manager.GetAppletFrontendSet()}; |
| 123 | frontend.error->ShowCustomErrorText( | 123 | frontend.error->ShowCustomErrorText( |
| 124 | RESULT_UNKNOWN, "There was an error while attempting to use Boxcat.", | 124 | ResultUnknown, "There was an error while attempting to use Boxcat.", |
| 125 | DOWNLOAD_RESULT_LOG_MESSAGES[static_cast<std::size_t>(res)], [] {}); | 125 | DOWNLOAD_RESULT_LOG_MESSAGES[static_cast<std::size_t>(res)], [] {}); |
| 126 | } | 126 | } |
| 127 | 127 | ||
diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/core/hle/service/filesystem/filesystem.cpp index 84d1717ab..4a1908bcb 100644 --- a/src/core/hle/service/filesystem/filesystem.cpp +++ b/src/core/hle/service/filesystem/filesystem.cpp | |||
| @@ -67,11 +67,11 @@ ResultCode VfsDirectoryServiceWrapper::CreateFile(const std::string& path_, u64 | |||
| 67 | auto file = dir->CreateFile(Common::FS::GetFilename(path)); | 67 | auto file = dir->CreateFile(Common::FS::GetFilename(path)); |
| 68 | if (file == nullptr) { | 68 | if (file == nullptr) { |
| 69 | // TODO(DarkLordZach): Find a better error code for this | 69 | // TODO(DarkLordZach): Find a better error code for this |
| 70 | return RESULT_UNKNOWN; | 70 | return ResultUnknown; |
| 71 | } | 71 | } |
| 72 | if (!file->Resize(size)) { | 72 | if (!file->Resize(size)) { |
| 73 | // TODO(DarkLordZach): Find a better error code for this | 73 | // TODO(DarkLordZach): Find a better error code for this |
| 74 | return RESULT_UNKNOWN; | 74 | return ResultUnknown; |
| 75 | } | 75 | } |
| 76 | return ResultSuccess; | 76 | return ResultSuccess; |
| 77 | } | 77 | } |
| @@ -89,7 +89,7 @@ ResultCode VfsDirectoryServiceWrapper::DeleteFile(const std::string& path_) cons | |||
| 89 | } | 89 | } |
| 90 | if (!dir->DeleteFile(Common::FS::GetFilename(path))) { | 90 | if (!dir->DeleteFile(Common::FS::GetFilename(path))) { |
| 91 | // TODO(DarkLordZach): Find a better error code for this | 91 | // TODO(DarkLordZach): Find a better error code for this |
| 92 | return RESULT_UNKNOWN; | 92 | return ResultUnknown; |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | return ResultSuccess; | 95 | return ResultSuccess; |
| @@ -104,7 +104,7 @@ ResultCode VfsDirectoryServiceWrapper::CreateDirectory(const std::string& path_) | |||
| 104 | auto new_dir = dir->CreateSubdirectory(Common::FS::GetFilename(path)); | 104 | auto new_dir = dir->CreateSubdirectory(Common::FS::GetFilename(path)); |
| 105 | if (new_dir == nullptr) { | 105 | if (new_dir == nullptr) { |
| 106 | // TODO(DarkLordZach): Find a better error code for this | 106 | // TODO(DarkLordZach): Find a better error code for this |
| 107 | return RESULT_UNKNOWN; | 107 | return ResultUnknown; |
| 108 | } | 108 | } |
| 109 | return ResultSuccess; | 109 | return ResultSuccess; |
| 110 | } | 110 | } |
| @@ -114,7 +114,7 @@ ResultCode VfsDirectoryServiceWrapper::DeleteDirectory(const std::string& path_) | |||
| 114 | auto dir = GetDirectoryRelativeWrapped(backing, Common::FS::GetParentPath(path)); | 114 | auto dir = GetDirectoryRelativeWrapped(backing, Common::FS::GetParentPath(path)); |
| 115 | if (!dir->DeleteSubdirectory(Common::FS::GetFilename(path))) { | 115 | if (!dir->DeleteSubdirectory(Common::FS::GetFilename(path))) { |
| 116 | // TODO(DarkLordZach): Find a better error code for this | 116 | // TODO(DarkLordZach): Find a better error code for this |
| 117 | return RESULT_UNKNOWN; | 117 | return ResultUnknown; |
| 118 | } | 118 | } |
| 119 | return ResultSuccess; | 119 | return ResultSuccess; |
| 120 | } | 120 | } |
| @@ -124,7 +124,7 @@ ResultCode VfsDirectoryServiceWrapper::DeleteDirectoryRecursively(const std::str | |||
| 124 | auto dir = GetDirectoryRelativeWrapped(backing, Common::FS::GetParentPath(path)); | 124 | auto dir = GetDirectoryRelativeWrapped(backing, Common::FS::GetParentPath(path)); |
| 125 | if (!dir->DeleteSubdirectoryRecursive(Common::FS::GetFilename(path))) { | 125 | if (!dir->DeleteSubdirectoryRecursive(Common::FS::GetFilename(path))) { |
| 126 | // TODO(DarkLordZach): Find a better error code for this | 126 | // TODO(DarkLordZach): Find a better error code for this |
| 127 | return RESULT_UNKNOWN; | 127 | return ResultUnknown; |
| 128 | } | 128 | } |
| 129 | return ResultSuccess; | 129 | return ResultSuccess; |
| 130 | } | 130 | } |
| @@ -135,7 +135,7 @@ ResultCode VfsDirectoryServiceWrapper::CleanDirectoryRecursively(const std::stri | |||
| 135 | 135 | ||
| 136 | if (!dir->CleanSubdirectoryRecursive(Common::FS::GetFilename(sanitized_path))) { | 136 | if (!dir->CleanSubdirectoryRecursive(Common::FS::GetFilename(sanitized_path))) { |
| 137 | // TODO(DarkLordZach): Find a better error code for this | 137 | // TODO(DarkLordZach): Find a better error code for this |
| 138 | return RESULT_UNKNOWN; | 138 | return ResultUnknown; |
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | return ResultSuccess; | 141 | return ResultSuccess; |
| @@ -152,7 +152,7 @@ ResultCode VfsDirectoryServiceWrapper::RenameFile(const std::string& src_path_, | |||
| 152 | return FileSys::ERROR_PATH_NOT_FOUND; | 152 | return FileSys::ERROR_PATH_NOT_FOUND; |
| 153 | if (!src->Rename(Common::FS::GetFilename(dest_path))) { | 153 | if (!src->Rename(Common::FS::GetFilename(dest_path))) { |
| 154 | // TODO(DarkLordZach): Find a better error code for this | 154 | // TODO(DarkLordZach): Find a better error code for this |
| 155 | return RESULT_UNKNOWN; | 155 | return ResultUnknown; |
| 156 | } | 156 | } |
| 157 | return ResultSuccess; | 157 | return ResultSuccess; |
| 158 | } | 158 | } |
| @@ -170,7 +170,7 @@ ResultCode VfsDirectoryServiceWrapper::RenameFile(const std::string& src_path_, | |||
| 170 | 170 | ||
| 171 | if (!src->GetContainingDirectory()->DeleteFile(Common::FS::GetFilename(src_path))) { | 171 | if (!src->GetContainingDirectory()->DeleteFile(Common::FS::GetFilename(src_path))) { |
| 172 | // TODO(DarkLordZach): Find a better error code for this | 172 | // TODO(DarkLordZach): Find a better error code for this |
| 173 | return RESULT_UNKNOWN; | 173 | return ResultUnknown; |
| 174 | } | 174 | } |
| 175 | 175 | ||
| 176 | return ResultSuccess; | 176 | return ResultSuccess; |
| @@ -187,7 +187,7 @@ ResultCode VfsDirectoryServiceWrapper::RenameDirectory(const std::string& src_pa | |||
| 187 | return FileSys::ERROR_PATH_NOT_FOUND; | 187 | return FileSys::ERROR_PATH_NOT_FOUND; |
| 188 | if (!src->Rename(Common::FS::GetFilename(dest_path))) { | 188 | if (!src->Rename(Common::FS::GetFilename(dest_path))) { |
| 189 | // TODO(DarkLordZach): Find a better error code for this | 189 | // TODO(DarkLordZach): Find a better error code for this |
| 190 | return RESULT_UNKNOWN; | 190 | return ResultUnknown; |
| 191 | } | 191 | } |
| 192 | return ResultSuccess; | 192 | return ResultSuccess; |
| 193 | } | 193 | } |
| @@ -199,7 +199,7 @@ ResultCode VfsDirectoryServiceWrapper::RenameDirectory(const std::string& src_pa | |||
| 199 | src_path, dest_path); | 199 | src_path, dest_path); |
| 200 | 200 | ||
| 201 | // TODO(DarkLordZach): Find a better error code for this | 201 | // TODO(DarkLordZach): Find a better error code for this |
| 202 | return RESULT_UNKNOWN; | 202 | return ResultUnknown; |
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | ResultVal<FileSys::VirtualFile> VfsDirectoryServiceWrapper::OpenFile(const std::string& path_, | 205 | ResultVal<FileSys::VirtualFile> VfsDirectoryServiceWrapper::OpenFile(const std::string& path_, |
| @@ -297,7 +297,7 @@ ResultVal<FileSys::VirtualFile> FileSystemController::OpenRomFSCurrentProcess() | |||
| 297 | 297 | ||
| 298 | if (romfs_factory == nullptr) { | 298 | if (romfs_factory == nullptr) { |
| 299 | // TODO(bunnei): Find a better error code for this | 299 | // TODO(bunnei): Find a better error code for this |
| 300 | return RESULT_UNKNOWN; | 300 | return ResultUnknown; |
| 301 | } | 301 | } |
| 302 | 302 | ||
| 303 | return romfs_factory->OpenCurrentProcess(system.CurrentProcess()->GetTitleID()); | 303 | return romfs_factory->OpenCurrentProcess(system.CurrentProcess()->GetTitleID()); |
| @@ -309,7 +309,7 @@ ResultVal<FileSys::VirtualFile> FileSystemController::OpenPatchedRomFS( | |||
| 309 | 309 | ||
| 310 | if (romfs_factory == nullptr) { | 310 | if (romfs_factory == nullptr) { |
| 311 | // TODO: Find a better error code for this | 311 | // TODO: Find a better error code for this |
| 312 | return RESULT_UNKNOWN; | 312 | return ResultUnknown; |
| 313 | } | 313 | } |
| 314 | 314 | ||
| 315 | return romfs_factory->OpenPatchedRomFS(title_id, type); | 315 | return romfs_factory->OpenPatchedRomFS(title_id, type); |
| @@ -322,7 +322,7 @@ ResultVal<FileSys::VirtualFile> FileSystemController::OpenPatchedRomFSWithProgra | |||
| 322 | 322 | ||
| 323 | if (romfs_factory == nullptr) { | 323 | if (romfs_factory == nullptr) { |
| 324 | // TODO: Find a better error code for this | 324 | // TODO: Find a better error code for this |
| 325 | return RESULT_UNKNOWN; | 325 | return ResultUnknown; |
| 326 | } | 326 | } |
| 327 | 327 | ||
| 328 | return romfs_factory->OpenPatchedRomFSWithProgramIndex(title_id, program_index, type); | 328 | return romfs_factory->OpenPatchedRomFSWithProgramIndex(title_id, program_index, type); |
| @@ -335,7 +335,7 @@ ResultVal<FileSys::VirtualFile> FileSystemController::OpenRomFS( | |||
| 335 | 335 | ||
| 336 | if (romfs_factory == nullptr) { | 336 | if (romfs_factory == nullptr) { |
| 337 | // TODO(bunnei): Find a better error code for this | 337 | // TODO(bunnei): Find a better error code for this |
| 338 | return RESULT_UNKNOWN; | 338 | return ResultUnknown; |
| 339 | } | 339 | } |
| 340 | 340 | ||
| 341 | return romfs_factory->Open(title_id, storage_id, type); | 341 | return romfs_factory->Open(title_id, storage_id, type); |
diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp index 37bcec5a1..d9e8020b4 100644 --- a/src/core/hle/service/filesystem/fsp_srv.cpp +++ b/src/core/hle/service/filesystem/fsp_srv.cpp | |||
| @@ -807,7 +807,7 @@ void FSP_SRV::OpenFileSystemWithPatch(Kernel::HLERequestContext& ctx) { | |||
| 807 | LOG_WARNING(Service_FS, "(STUBBED) called with type={}, title_id={:016X}", type, title_id); | 807 | LOG_WARNING(Service_FS, "(STUBBED) called with type={}, title_id={:016X}", type, title_id); |
| 808 | 808 | ||
| 809 | IPC::ResponseBuilder rb{ctx, 2, 0, 0}; | 809 | IPC::ResponseBuilder rb{ctx, 2, 0, 0}; |
| 810 | rb.Push(RESULT_UNKNOWN); | 810 | rb.Push(ResultUnknown); |
| 811 | } | 811 | } |
| 812 | 812 | ||
| 813 | void FSP_SRV::OpenSdCardFileSystem(Kernel::HLERequestContext& ctx) { | 813 | void FSP_SRV::OpenSdCardFileSystem(Kernel::HLERequestContext& ctx) { |
| @@ -941,7 +941,7 @@ void FSP_SRV::OpenDataStorageByCurrentProcess(Kernel::HLERequestContext& ctx) { | |||
| 941 | // TODO (bunnei): Find the right error code to use here | 941 | // TODO (bunnei): Find the right error code to use here |
| 942 | LOG_CRITICAL(Service_FS, "no file system interface available!"); | 942 | LOG_CRITICAL(Service_FS, "no file system interface available!"); |
| 943 | IPC::ResponseBuilder rb{ctx, 2}; | 943 | IPC::ResponseBuilder rb{ctx, 2}; |
| 944 | rb.Push(RESULT_UNKNOWN); | 944 | rb.Push(ResultUnknown); |
| 945 | return; | 945 | return; |
| 946 | } | 946 | } |
| 947 | 947 | ||
| @@ -978,7 +978,7 @@ void FSP_SRV::OpenDataStorageByDataId(Kernel::HLERequestContext& ctx) { | |||
| 978 | "could not open data storage with title_id={:016X}, storage_id={:02X}", title_id, | 978 | "could not open data storage with title_id={:016X}, storage_id={:02X}", title_id, |
| 979 | storage_id); | 979 | storage_id); |
| 980 | IPC::ResponseBuilder rb{ctx, 2}; | 980 | IPC::ResponseBuilder rb{ctx, 2}; |
| 981 | rb.Push(RESULT_UNKNOWN); | 981 | rb.Push(ResultUnknown); |
| 982 | return; | 982 | return; |
| 983 | } | 983 | } |
| 984 | 984 | ||
| @@ -1019,7 +1019,7 @@ void FSP_SRV::OpenDataStorageWithProgramIndex(Kernel::HLERequestContext& ctx) { | |||
| 1019 | LOG_ERROR(Service_FS, "could not open storage with program_index={}", program_index); | 1019 | LOG_ERROR(Service_FS, "could not open storage with program_index={}", program_index); |
| 1020 | 1020 | ||
| 1021 | IPC::ResponseBuilder rb{ctx, 2}; | 1021 | IPC::ResponseBuilder rb{ctx, 2}; |
| 1022 | rb.Push(RESULT_UNKNOWN); | 1022 | rb.Push(ResultUnknown); |
| 1023 | return; | 1023 | return; |
| 1024 | } | 1024 | } |
| 1025 | 1025 | ||
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 195284727..fa6213d3c 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp | |||
| @@ -1500,7 +1500,7 @@ void Hid::InitializeSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { | |||
| 1500 | if (t_mem_1.IsNull()) { | 1500 | if (t_mem_1.IsNull()) { |
| 1501 | LOG_ERROR(Service_HID, "t_mem_1 is a nullptr for handle=0x{:08X}", t_mem_1_handle); | 1501 | LOG_ERROR(Service_HID, "t_mem_1 is a nullptr for handle=0x{:08X}", t_mem_1_handle); |
| 1502 | IPC::ResponseBuilder rb{ctx, 2}; | 1502 | IPC::ResponseBuilder rb{ctx, 2}; |
| 1503 | rb.Push(RESULT_UNKNOWN); | 1503 | rb.Push(ResultUnknown); |
| 1504 | return; | 1504 | return; |
| 1505 | } | 1505 | } |
| 1506 | 1506 | ||
| @@ -1510,7 +1510,7 @@ void Hid::InitializeSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { | |||
| 1510 | if (t_mem_2.IsNull()) { | 1510 | if (t_mem_2.IsNull()) { |
| 1511 | LOG_ERROR(Service_HID, "t_mem_2 is a nullptr for handle=0x{:08X}", t_mem_2_handle); | 1511 | LOG_ERROR(Service_HID, "t_mem_2 is a nullptr for handle=0x{:08X}", t_mem_2_handle); |
| 1512 | IPC::ResponseBuilder rb{ctx, 2}; | 1512 | IPC::ResponseBuilder rb{ctx, 2}; |
| 1513 | rb.Push(RESULT_UNKNOWN); | 1513 | rb.Push(ResultUnknown); |
| 1514 | return; | 1514 | return; |
| 1515 | } | 1515 | } |
| 1516 | 1516 | ||
diff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cpp index 9f5fbfc0f..8ce1f3296 100644 --- a/src/core/hle/service/ns/ns.cpp +++ b/src/core/hle/service/ns/ns.cpp | |||
| @@ -335,7 +335,7 @@ void IApplicationManagerInterface::GetApplicationControlData(Kernel::HLERequestC | |||
| 335 | "output buffer is too small! (actual={:016X}, expected_min=0x4000)", size); | 335 | "output buffer is too small! (actual={:016X}, expected_min=0x4000)", size); |
| 336 | IPC::ResponseBuilder rb{ctx, 2}; | 336 | IPC::ResponseBuilder rb{ctx, 2}; |
| 337 | // TODO(DarkLordZach): Find a better error code for this. | 337 | // TODO(DarkLordZach): Find a better error code for this. |
| 338 | rb.Push(RESULT_UNKNOWN); | 338 | rb.Push(ResultUnknown); |
| 339 | return; | 339 | return; |
| 340 | } | 340 | } |
| 341 | 341 | ||
| @@ -355,7 +355,7 @@ void IApplicationManagerInterface::GetApplicationControlData(Kernel::HLERequestC | |||
| 355 | 0x4000 + control.second->GetSize()); | 355 | 0x4000 + control.second->GetSize()); |
| 356 | IPC::ResponseBuilder rb{ctx, 2}; | 356 | IPC::ResponseBuilder rb{ctx, 2}; |
| 357 | // TODO(DarkLordZach): Find a better error code for this. | 357 | // TODO(DarkLordZach): Find a better error code for this. |
| 358 | rb.Push(RESULT_UNKNOWN); | 358 | rb.Push(ResultUnknown); |
| 359 | return; | 359 | return; |
| 360 | } | 360 | } |
| 361 | 361 | ||