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

8
stratosphere/ams_mitm/source/set_mitm/set_mitm_service.cpp
View File

@@ -48,7 +48,7 @@ namespace ams::mitm::settings {
Result SetMitmService::EnsureLocale() {
/* Optimization: if locale has already been gotten, we can stop. */
if (AMS_LIKELY(m_got_locale)) {
return ResultSuccess();
R_SUCCEED();
}
std::scoped_lock lk(m_lock);
@@ -77,7 +77,7 @@ namespace ams::mitm::settings {
}
}
return ResultSuccess();
R_SUCCEED();
}
void SetMitmService::InvalidateLocale() {
@@ -105,7 +105,7 @@ namespace ams::mitm::settings {
}
out.SetValue(m_locale.language_code);
return ResultSuccess();
R_SUCCEED();
}
Result SetMitmService::GetRegionCode(sf::Out<settings::RegionCode> out) {
@@ -124,7 +124,7 @@ namespace ams::mitm::settings {
}
out.SetValue(m_locale.region_code);
return ResultSuccess();
R_SUCCEED();
}
}

10
stratosphere/ams_mitm/source/set_mitm/setsys_mitm_service.cpp
View File

@@ -84,7 +84,7 @@ namespace ams::mitm::settings {
*out = g_firmware_version;
}
return ResultSuccess();
R_SUCCEED();
}
}
@@ -95,7 +95,7 @@ namespace ams::mitm::settings {
/* GetFirmwareVersion sanitizes the revision fields. */
out.GetPointer()->revision_major = 0;
out.GetPointer()->revision_minor = 0;
return ResultSuccess();
R_SUCCEED();
}
Result SetSysMitmService::GetFirmwareVersion2(sf::Out<settings::FirmwareVersion> out) {
@@ -108,7 +108,7 @@ namespace ams::mitm::settings {
R_CONVERT_ALL(sm::mitm::ResultShouldForwardToSession());
} R_END_TRY_CATCH;
return ResultSuccess();
R_SUCCEED();
}
Result SetSysMitmService::GetSettingsItemValue(sf::Out<u64> out_size, const sf::OutBuffer &out, const settings::SettingsName &name, const settings::SettingsItemKey &key) {
@@ -117,7 +117,7 @@ namespace ams::mitm::settings {
R_CONVERT_ALL(sm::mitm::ResultShouldForwardToSession());
} R_END_TRY_CATCH;
return ResultSuccess();
R_SUCCEED();
}
Result SetSysMitmService::GetDebugModeFlag(sf::Out<bool> out) {
@@ -129,7 +129,7 @@ namespace ams::mitm::settings {
settings::fwdbg::GetSettingsItemValue(std::addressof(en), sizeof(en), "atmosphere", "enable_am_debug_mode");
out.SetValue(en != 0);
return ResultSuccess();
R_SUCCEED();
}
}

32
stratosphere/ams_mitm/source/set_mitm/settings_sd_kvs.cpp
View File

@@ -127,7 +127,7 @@ namespace ams::settings::fwdbg {
R_UNLESS(len > 0, settings::ResultEmptySettingsName());
R_UNLESS(len <= SettingsNameLengthMax, settings::ResultTooLongSettingsName());
R_UNLESS(IsValidSettingsFormat(name, len), settings::ResultInvalidFormatSettingsName());
return ResultSuccess();
R_SUCCEED();
}
Result ValidateSettingsItemKey(const char *key) {
@@ -136,7 +136,7 @@ namespace ams::settings::fwdbg {
R_UNLESS(len > 0, settings::ResultEmptySettingsItemKey());
R_UNLESS(len <= SettingsNameLengthMax, settings::ResultTooLongSettingsItemKey());
R_UNLESS(IsValidSettingsFormat(key, len), settings::ResultInvalidFormatSettingsItemKey());
return ResultSuccess();
R_SUCCEED();
}
Result AllocateValue(void **out, size_t size) {
@@ -144,35 +144,35 @@ namespace ams::settings::fwdbg {
*out = g_value_storage + g_allocated_value_storage_size;
g_allocated_value_storage_size += size;
return ResultSuccess();
R_SUCCEED();
}
Result FindSettingsName(const char **out, const char *name) {
for (auto &stored : g_names) {
if (std::strcmp(stored.value, name) == 0) {
*out = stored.value;
return ResultSuccess();
R_SUCCEED();
} else if (std::strcmp(stored.value, "") == 0) {
*out = stored.value;
std::strcpy(stored.value, name);
return ResultSuccess();
R_SUCCEED();
}
}
return settings::ResultSettingsItemKeyAllocationFailed();
R_THROW(settings::ResultSettingsItemKeyAllocationFailed());
}
Result FindSettingsItemKey(const char **out, const char *key) {
for (auto &stored : g_item_keys) {
if (std::strcmp(stored.value, key) == 0) {
*out = stored.value;
return ResultSuccess();
R_SUCCEED();
} else if (std::strcmp(stored.value, "") == 0) {
std::strcpy(stored.value, key);
*out = stored.value;
return ResultSuccess();
R_SUCCEED();
}
}
return settings::ResultSettingsItemKeyAllocationFailed();
R_THROW(settings::ResultSettingsItemKeyAllocationFailed());
}
template<typename T>
@@ -182,7 +182,7 @@ namespace ams::settings::fwdbg {
T value = static_cast<T>(strtoul(value_str, nullptr, 0));
std::memcpy(out.value, std::addressof(value), sizeof(T));
return ResultSuccess();
R_SUCCEED();
}
Result GetEntry(SdKeyValueStoreEntry **out, const char *name, const char *key) {
@@ -200,7 +200,7 @@ namespace ams::settings::fwdbg {
R_UNLESS(*it == test_entry, settings::ResultSettingsItemNotFound());
*out = std::addressof(*it);
return ResultSuccess();
R_SUCCEED();
}
Result ParseSettingsItemValueImpl(const char *name, const char *key, const char *val_tup) {
@@ -253,7 +253,7 @@ namespace ams::settings::fwdbg {
} else if (strncasecmp(type, "u64", type_len) == 0) {
R_TRY((ParseSettingsItemIntegralValue<u64>(new_value, value_str)));
} else {
return settings::ResultInvalidFormatSettingsItemValue();
R_THROW(settings::ResultInvalidFormatSettingsItemValue());
}
/* Insert the entry. */
@@ -267,7 +267,7 @@ namespace ams::settings::fwdbg {
}
R_UNLESS(inserted, settings::ResultSettingsItemValueAllocationFailed());
return ResultSuccess();
R_SUCCEED();
}
Result ParseSettingsItemValue(const char *name, const char *key, const char *value) {
@@ -303,7 +303,7 @@ namespace ams::settings::fwdbg {
util::ini::ParseFile(file.get(), std::addressof(parse_result), SystemSettingsIniHandler);
R_TRY(parse_result);
return ResultSuccess();
R_SUCCEED();
}
void LoadDefaultCustomSettings() {
@@ -435,7 +435,7 @@ namespace ams::settings::fwdbg {
R_TRY(GetEntry(std::addressof(entry), name, key));
*out_size = entry->value_size;
return ResultSuccess();
R_SUCCEED();
}
Result GetSdCardKeyValueStoreSettingsItemValue(size_t *out_size, void *dst, size_t dst_size, const char *name, const char *key) {
@@ -449,7 +449,7 @@ namespace ams::settings::fwdbg {
std::memcpy(dst, entry->value, size);
}
*out_size = size;
return ResultSuccess();
R_SUCCEED();
}
}