OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ams: use R_SUCCEED, R_THROW globally

Browse Source
This commit is contained in:
Michael Scire
2022-03-26 00:14:36 -07:00
parent e5b1739f65
commit dd78ede99f
370 changed files with 2107 additions and 2107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/libstratosphere/source/fssrv/fscreator/fssrv_partition_file_system_creator.cpp
View File

@@ -27,7 +27,7 @@ namespace ams::fssrv::fscreator {
/* Set the output. */
*out = std::move(fs);
return ResultSuccess();
R_SUCCEED();
}
}

2
libraries/libstratosphere/source/fssrv/fscreator/fssrv_rom_file_system_creator.cpp
View File

@@ -64,7 +64,7 @@ namespace ams::fssrv::fscreator {
/* Set the output. */
*out = std::move(fs);
return ResultSuccess();
R_SUCCEED();
}
}

10
libraries/libstratosphere/source/fssrv/fscreator/fssrv_storage_on_nca_creator.cpp
View File

@@ -29,7 +29,7 @@ namespace ams::fssrv::fscreator {
/* Set the out storage. */
*out = std::move(storage);
*out_splitter = std::move(splitter);
return ResultSuccess();
R_SUCCEED();
}
Result StorageOnNcaCreator::CreateWithPatch(std::shared_ptr<fs::IStorage> *out, std::shared_ptr<fssystem::IAsynchronousAccessSplitter> *out_splitter, fssystem::NcaFsHeaderReader *out_header_reader, std::shared_ptr<fssystem::NcaReader> original_nca_reader, std::shared_ptr<fssystem::NcaReader> current_nca_reader, s32 index) {
@@ -44,7 +44,7 @@ namespace ams::fssrv::fscreator {
/* Set the out storage. */
*out = std::move(storage);
*out_splitter = std::move(splitter);
return ResultSuccess();
R_SUCCEED();
}
Result StorageOnNcaCreator::CreateNcaReader(std::shared_ptr<fssystem::NcaReader> *out, std::shared_ptr<fs::IStorage> storage) {
@@ -57,7 +57,7 @@ namespace ams::fssrv::fscreator {
/* Set the output. */
*out = std::move(reader);
return ResultSuccess();
R_SUCCEED();
}
#if !defined(ATMOSPHERE_BOARD_NINTENDO_NX)
@@ -73,7 +73,7 @@ namespace ams::fssrv::fscreator {
/* Set the out storage. */
*out = std::move(storage);
*out_splitter = std::move(splitter);
return ResultSuccess();
R_SUCCEED();
}
Result StorageOnNcaCreator::CreateWithPatchWithContext(std::shared_ptr<fs::IStorage> *out, std::shared_ptr<fssystem::IAsynchronousAccessSplitter> *out_splitter, fssystem::NcaFsHeaderReader *out_header_reader, void *ctx, std::shared_ptr<fssystem::NcaReader> original_nca_reader, std::shared_ptr<fssystem::NcaReader> current_nca_reader, s32 index) {
@@ -88,7 +88,7 @@ namespace ams::fssrv::fscreator {
/* Set the out storage. */
*out = std::move(storage);
*out_splitter = std::move(splitter);
return ResultSuccess();
R_SUCCEED();
}
Result StorageOnNcaCreator::CreateByRawStorage(std::shared_ptr<fs::IStorage> *out, std::shared_ptr<fssystem::IAsynchronousAccessSplitter> *out_splitter, const fssystem::NcaFsHeaderReader *header_reader, std::shared_ptr<fs::IStorage> raw_storage, void *ctx, std::shared_ptr<fssystem::NcaReader> nca_reader) {

4
libraries/libstratosphere/source/fssrv/fssrv_file_system_proxy_api.cpp
View File

@@ -66,7 +66,7 @@ namespace ams::fssrv {
R_TRY(this->AcceptImpl(server, impl::GetInvalidProgramRegistryServiceObject()));
}
return ResultSuccess();
R_SUCCEED();
}
break;
case PortIndex_FileSystemProxyForLoader:
@@ -81,7 +81,7 @@ namespace ams::fssrv {
R_TRY(this->AcceptImpl(server, impl::GetInvalidFileSystemProxyForLoaderServiceObject()));
}
return ResultSuccess();
R_SUCCEED();
}
break;
AMS_UNREACHABLE_DEFAULT_CASE();

2
libraries/libstratosphere/source/fssrv/fssrv_program_registry_impl.cpp
View File

@@ -71,7 +71,7 @@ namespace ams::fssrv {
/* Set our process id. */
m_process_id = client_pid.GetValue().value;
return ResultSuccess();
R_SUCCEED();
}
Result ProgramRegistryImpl::SetEnabledProgramVerification(bool en) {

16
libraries/libstratosphere/source/fssrv/impl/fssrv_program_registry_manager.cpp
View File

@@ -44,7 +44,7 @@ namespace ams::fssrv::impl {
/* Add the node to the registry. */
m_program_info_list.push_back(*new_node.release());
return ResultSuccess();
R_SUCCEED();
}
Result ProgramRegistryManager::UnregisterProgram(u64 process_id) {
@@ -56,12 +56,12 @@ namespace ams::fssrv::impl {
if (node.program_info->Contains(process_id)) {
m_program_info_list.erase(m_program_info_list.iterator_to(node));
delete std::addressof(node);
return ResultSuccess();
R_SUCCEED();
}
}
/* We couldn't find/unregister the process's node. */
return fs::ResultInvalidArgument();
R_THROW(fs::ResultInvalidArgument());
}
Result ProgramRegistryManager::GetProgramInfo(std::shared_ptr<ProgramInfo> *out, u64 process_id) {
@@ -71,19 +71,19 @@ namespace ams::fssrv::impl {
/* Check if we're getting permissions for an initial program. */
if (IsInitialProgram(process_id)) {
*out = ProgramInfo::GetProgramInfoForInitialProcess();
return ResultSuccess();
R_SUCCEED();
}
/* Find a matching node. */
for (const auto &node : m_program_info_list) {
if (node.program_info->Contains(process_id)) {
*out = node.program_info;
return ResultSuccess();
R_SUCCEED();
}
}
/* We didn't find the program info. */
return fs::ResultProgramInfoNotFound();
R_THROW(fs::ResultProgramInfoNotFound());
}
Result ProgramRegistryManager::GetProgramInfoByProgramId(std::shared_ptr<ProgramInfo> *out, u64 program_id) {
@@ -94,12 +94,12 @@ namespace ams::fssrv::impl {
for (const auto &node : m_program_info_list) {
if (node.program_info->GetProgramIdValue() == program_id) {
*out = node.program_info;
return ResultSuccess();
R_SUCCEED();
}
}
/* We didn't find the program info. */
return fs::ResultProgramInfoNotFound();
R_THROW(fs::ResultProgramInfoNotFound());
}
}