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

18
stratosphere/ams_mitm/source/fs_mitm/fs_mitm_service.cpp
View File

@@ -91,7 +91,7 @@ namespace ams::mitm::fs {
R_TRY(subdir_fs->Initialize(AtmosphereHblWebContentDirPath));
out.SetValue(MakeSharedFileSystem(std::make_shared<fs::ReadOnlyFileSystem>(std::move(subdir_fs)), false), target_object_id);
return ResultSuccess();
R_SUCCEED();
}
Result OpenProgramSpecificWebContentFileSystem(sf::Out<sf::SharedPointer<ams::fssrv::sf::IFileSystem>> &out, ncm::ProgramId program_id, FsFileSystemType filesystem_type, Service *fwd, const fssrv::sf::Path *path, bool with_id) {
@@ -142,7 +142,7 @@ namespace ams::mitm::fs {
out.SetValue(MakeSharedFileSystem(std::move(new_fs), false), target_object_id);
}
return ResultSuccess();
R_SUCCEED();
}
Result OpenWebContentFileSystem(sf::Out<sf::SharedPointer<ams::fssrv::sf::IFileSystem>> &out, ncm::ProgramId client_program_id, ncm::ProgramId program_id, FsFileSystemType filesystem_type, Service *fwd, const fssrv::sf::Path *path, bool with_id, bool try_program_specific) {
@@ -185,7 +185,7 @@ namespace ams::mitm::fs {
R_TRY(redir_fs->InitializeWithFixedPath("/Nintendo", emummc::GetNintendoDirPath()));
out.SetValue(MakeSharedFileSystem(std::move(redir_fs), false), target_object_id);
return ResultSuccess();
R_SUCCEED();
}
Result FsMitmService::OpenSaveDataFileSystem(sf::Out<sf::SharedPointer<ams::fssrv::sf::IFileSystem>> out, u8 _space_id, const fs::SaveDataAttribute &attribute) {
@@ -260,7 +260,7 @@ namespace ams::mitm::fs {
/* Set output. */
out.SetValue(MakeSharedFileSystem(std::move(dirsave_ifs), false), target_object_id);
return ResultSuccess();
R_SUCCEED();
}
Result FsMitmService::OpenBisStorage(sf::Out<sf::SharedPointer<ams::fssrv::sf::IStorage>> out, u32 _bis_partition_id) {
@@ -302,7 +302,7 @@ namespace ams::mitm::fs {
}
}
return ResultSuccess();
R_SUCCEED();
}
Result FsMitmService::OpenDataStorageByCurrentProcess(sf::Out<sf::SharedPointer<ams::fssrv::sf::IStorage>> out) {
@@ -319,7 +319,7 @@ namespace ams::mitm::fs {
/* Get a layered storage for the process romfs. */
out.SetValue(MakeSharedStorage(GetLayeredRomfsStorage(m_client_info.program_id, data_storage, true)), target_object_id);
return ResultSuccess();
R_SUCCEED();
}
Result FsMitmService::OpenDataStorageByDataId(sf::Out<sf::SharedPointer<ams::fssrv::sf::IStorage>> out, ncm::DataId _data_id, u8 storage_id) {
@@ -339,7 +339,7 @@ namespace ams::mitm::fs {
/* Get a layered storage for the data id. */
out.SetValue(MakeSharedStorage(GetLayeredRomfsStorage(data_id, data_storage, false)), target_object_id);
return ResultSuccess();
R_SUCCEED();
}
Result FsMitmService::OpenDataStorageWithProgramIndex(sf::Out<sf::SharedPointer<ams::fssrv::sf::IStorage>> out, u8 program_index) {
@@ -360,7 +360,7 @@ namespace ams::mitm::fs {
/* Get a layered storage for the process romfs. */
out.SetValue(MakeSharedStorage(GetLayeredRomfsStorage(program_id, data_storage, true)), target_object_id);
return ResultSuccess();
R_SUCCEED();
}
Result FsMitmService::RegisterProgramIndexMapInfo(const sf::InBuffer &info_buffer, s32 info_count) {
@@ -370,7 +370,7 @@ namespace ams::mitm::fs {
/* Register with ourselves. */
R_ABORT_UNLESS(g_program_index_map_info_manager.Reset(reinterpret_cast<const fs::ProgramIndexMapInfo *>(info_buffer.GetPointer()), info_count));
return ResultSuccess();
R_SUCCEED();
}
}

8
stratosphere/ams_mitm/source/fs_mitm/fsmitm_boot0storage.hpp
View File

@@ -36,7 +36,7 @@ namespace ams::mitm::fs {
/* Check if we have nothing to do. */
if (size == 0) {
return ResultSuccess();
R_SUCCEED();
}
/* Fast case. */
@@ -69,7 +69,7 @@ namespace ams::mitm::fs {
}
}
return ResultSuccess();
R_SUCCEED();
}
virtual Result Write(s64 offset, const void *_buffer, size_t size) override {
@@ -80,7 +80,7 @@ namespace ams::mitm::fs {
/* Check if we have nothing to do. */
if (size == 0) {
return ResultSuccess();
R_SUCCEED();
}
/* Fast case. */
@@ -117,7 +117,7 @@ namespace ams::mitm::fs {
}
}
return ResultSuccess();
R_SUCCEED();
}
};

12
stratosphere/ams_mitm/source/fs_mitm/fsmitm_layered_romfs_storage.cpp
View File

@@ -368,7 +368,7 @@ namespace ams::mitm::fs {
}
}
return ResultSuccess();
R_SUCCEED();
}
Result LayeredRomfsStorageImpl::GetSize(s64 *out_size) {
@@ -378,11 +378,11 @@ namespace ams::mitm::fs {
}
*out_size = this->GetSize();
return ResultSuccess();
R_SUCCEED();
}
Result LayeredRomfsStorageImpl::Flush() {
return ResultSuccess();
R_SUCCEED();
}
Result LayeredRomfsStorageImpl::OperateRange(void *dst, size_t dst_size, OperationId op_id, s64 offset, s64 size, const void *src, size_t src_size) {
@@ -397,12 +397,12 @@ namespace ams::mitm::fs {
R_UNLESS(dst_size == sizeof(QueryRangeInfo), fs::ResultInvalidSize());
reinterpret_cast<QueryRangeInfo *>(dst)->Clear();
}
return ResultSuccess();
R_SUCCEED();
}
/* TODO: How to deal with this? */
return fs::ResultUnsupportedOperation();
R_THROW(fs::ResultUnsupportedOperation());
default:
return fs::ResultUnsupportedOperation();
R_THROW(fs::ResultUnsupportedOperation());
}
}

2
stratosphere/ams_mitm/source/fs_mitm/fsmitm_readonly_layered_filesystem.hpp
View File

@@ -78,7 +78,7 @@ namespace ams::mitm::fs {
}
virtual Result DoCommit() override final {
return ResultSuccess();
R_SUCCEED();
}
virtual Result DoGetFreeSpaceSize(s64 *out, const ams::fs::Path &path) {

10
stratosphere/ams_mitm/source/fs_mitm/fsmitm_save_utils.cpp
View File

@@ -44,10 +44,10 @@ namespace ams::mitm::fs {
*out_str = "safe";
break;
default:
return fs::ResultInvalidSaveDataSpaceId();
R_THROW(fs::ResultInvalidSaveDataSpaceId());
}
return ResultSuccess();
R_SUCCEED();
}
Result GetSaveDataTypeString(const char **out_str, SaveDataType save_data_type) {
@@ -75,10 +75,10 @@ namespace ams::mitm::fs {
break;
default:
/* TODO: Better result? */
return fs::ResultInvalidArgument();
R_THROW(fs::ResultInvalidArgument());
}
return ResultSuccess();
R_SUCCEED();
}
constexpr inline bool IsEmptyAccountId(const UserId &uid) {
@@ -108,7 +108,7 @@ namespace ams::mitm::fs {
R_UNLESS(out_path_len < dst_size, fs::ResultTooLongPath());
return ResultSuccess();
R_SUCCEED();
}
}