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

64
libraries/libstratosphere/source/settings/impl/settings_key_value_store.cpp
View File

@@ -330,7 +330,7 @@ namespace ams::settings::impl {
/* Set the output pointer. */
*out = map;
return ResultSuccess();
R_SUCCEED();
}
Result GetKeyValueStoreMapForciblyForDebug(Map **out) {
@@ -388,7 +388,7 @@ namespace ams::settings::impl {
/* Ensure we don't free the value buffers we returned. */
map_value.current_value = nullptr;
map_value.default_value = nullptr;
return ResultSuccess();
R_SUCCEED();
}
template<typename T>
@@ -428,7 +428,7 @@ namespace ams::settings::impl {
/* Set the output pointer. */
*out_data = data;
return ResultSuccess();
R_SUCCEED();
}
Result GetSystemSaveData(SystemSaveData **out_data, bool create_save) {
@@ -453,7 +453,7 @@ namespace ams::settings::impl {
/* Set the output pointer. */
*out_data = data;
return ResultSuccess();
R_SUCCEED();
}
Result LoadKeyValueStoreMap(Map *out) {
@@ -501,7 +501,7 @@ namespace ams::settings::impl {
}
}
return ResultSuccess();
R_SUCCEED();
}
Result LoadKeyValueStoreMap(Map *out, SplHardwareType hardware_type) {
@@ -510,7 +510,7 @@ namespace ams::settings::impl {
/* Get the platform configuration system data for the hardware type. */
switch (hardware_type) {
case SplHardwareType_None:
return ResultSuccess();
R_SUCCEED();
case SplHardwareType_Icosa:
R_TRY(GetSystemData<SystemDataTag::PfCfg>(std::addressof(data), ncm::SystemDataId::PlatformConfigIcosa));
break;
@@ -579,10 +579,10 @@ namespace ams::settings::impl {
}
}
return ResultSuccess();
R_SUCCEED();
}));
return ResultSuccess();
R_SUCCEED();
}
template<typename T>
@@ -636,10 +636,10 @@ namespace ams::settings::impl {
/* Insert the value into the map. */
map[std::move(default_key)] = default_value;
return ResultSuccess();
R_SUCCEED();
}));
return ResultSuccess();
R_SUCCEED();
}
template<typename T, typename F>
@@ -657,7 +657,7 @@ namespace ams::settings::impl {
R_TRY(LoadKeyValueStoreMapEntry(out, data, offset, load));
}
return ResultSuccess();
R_SUCCEED();
}
template<typename T, typename F>
@@ -729,7 +729,7 @@ namespace ams::settings::impl {
/* Load the current values for the system save data. */
R_TRY(LoadKeyValueStoreMapCurrent(out, *system_save_data));
return ResultSuccess();
R_SUCCEED();
}
template<typename T>
@@ -741,7 +741,7 @@ namespace ams::settings::impl {
/* Increment the offset. */
offset += static_cast<s64>(size);
return ResultSuccess();
R_SUCCEED();
}
template<typename T>
@@ -762,7 +762,7 @@ namespace ams::settings::impl {
/* We succeeded. */
alloc_guard.Cancel();
return ResultSuccess();
R_SUCCEED();
}
template<typename T>
@@ -788,7 +788,7 @@ namespace ams::settings::impl {
/* Set the count. */
*out_count = size;
return ResultSuccess();
R_SUCCEED();
}
Result ReadSystemDataFirmwareDebug(u64 *out_count, char * const out_buffer, size_t out_buffer_size) {
@@ -808,7 +808,7 @@ namespace ams::settings::impl {
*out_count = 0;
}
return ResultSuccess();
R_SUCCEED();
}
Result ReadSystemDataPlatformConfiguration(u64 *out_count, char * const out_buffer, size_t out_buffer_size) {
@@ -821,7 +821,7 @@ namespace ams::settings::impl {
switch (GetSplHardwareType()) {
case SplHardwareType_None:
*out_count = 0;
return ResultSuccess();
R_SUCCEED();
case SplHardwareType_Icosa:
system_data_id = ncm::SystemDataId::PlatformConfigIcosa;
break;
@@ -855,7 +855,7 @@ namespace ams::settings::impl {
*out_count = 0;
}
return ResultSuccess();
R_SUCCEED();
}
Result ReadSystemSaveData(u64 *out_count, char * const out_buffer, size_t out_buffer_size) {
@@ -875,7 +875,7 @@ namespace ams::settings::impl {
*out_count = 0;
}
return ResultSuccess();
R_SUCCEED();
}
Result SaveKeyValueStoreMap(const Map &map) {
@@ -1007,7 +1007,7 @@ namespace ams::settings::impl {
offset += static_cast<s64>(value_size);
}
return ResultSuccess();
R_SUCCEED();
}
}
@@ -1067,7 +1067,7 @@ namespace ams::settings::impl {
.entire_size = item_map_key_size,
.map_key = buffer,
};
return ResultSuccess();
R_SUCCEED();
}
Result KeyValueStore::GetValue(u64 *out_count, char *out_buffer, size_t out_buffer_size, const SettingsItemKey &item_key) {
@@ -1104,7 +1104,7 @@ namespace ams::settings::impl {
/* Set the output count. */
*out_count = current_value_size;
return ResultSuccess();
R_SUCCEED();
}
Result KeyValueStore::GetValueSize(u64 *out_value_size, const SettingsItemKey &item_key) {
@@ -1128,7 +1128,7 @@ namespace ams::settings::impl {
/* Output the value size. */
*out_value_size = it->second.current_value_size;
return ResultSuccess();
R_SUCCEED();
}
Result KeyValueStore::ResetValue(const SettingsItemKey &item_key) {
@@ -1177,7 +1177,7 @@ namespace ams::settings::impl {
FreeToHeap(prev_value, prev_value_size);
}
return ResultSuccess();
R_SUCCEED();
}
Result KeyValueStore::SetValue(const SettingsItemKey &item_key, const void *buffer, size_t buffer_size) {
@@ -1246,7 +1246,7 @@ namespace ams::settings::impl {
return result;
}
return ResultSuccess();
R_SUCCEED();
}
Result AddKeyValueStoreItemForDebug(const KeyValueStoreItemForDebug * const items, size_t items_count) {
@@ -1298,7 +1298,7 @@ namespace ams::settings::impl {
map_value.default_value = nullptr;
}
return ResultSuccess();
R_SUCCEED();
}
Result AdvanceKeyValueStoreKeyIterator(KeyValueStoreKeyIterator *out) {
@@ -1350,7 +1350,7 @@ namespace ams::settings::impl {
out->entire_size = map_key_size;
out->map_key = buffer;
return ResultSuccess();
R_SUCCEED();
}
Result DestroyKeyValueStoreKeyIterator(KeyValueStoreKeyIterator *out) {
@@ -1370,7 +1370,7 @@ namespace ams::settings::impl {
out->header_size = 0;
out->entire_size = 0;
out->map_key = nullptr;
return ResultSuccess();
R_SUCCEED();
}
Result GetKeyValueStoreItemCountForDebug(u64 *out_count) {
@@ -1387,7 +1387,7 @@ namespace ams::settings::impl {
/* Output the item count. */
*out_count = map->size();
return ResultSuccess();
R_SUCCEED();
}
Result GetKeyValueStoreItemForDebug(u64 *out_count, KeyValueStoreItemForDebug * const out_items, size_t out_items_count) {
@@ -1430,7 +1430,7 @@ namespace ams::settings::impl {
/* Set the output count. */
*out_count = count;
return ResultSuccess();
R_SUCCEED();
}
Result GetKeyValueStoreKeyIteratorKey(u64 *out_count, char *out_buffer, size_t out_buffer_size, const KeyValueStoreKeyIterator &iterator) {
@@ -1452,7 +1452,7 @@ namespace ams::settings::impl {
/* Output the key size. */
*out_count = key_size;
return ResultSuccess();
R_SUCCEED();
}
Result GetKeyValueStoreKeyIteratorKeySize(u64 *out_count, const KeyValueStoreKeyIterator &iterator) {
@@ -1464,7 +1464,7 @@ namespace ams::settings::impl {
/* Output the key size. */
*out_count = std::min(iterator.entire_size - iterator.header_size, SettingsItemKeyLengthMax + 1);
return ResultSuccess();
R_SUCCEED();
}
Result ReadKeyValueStoreFirmwareDebug(u64 *out_count, char * const out_buffer, size_t out_buffer_size) {

2
libraries/libstratosphere/source/settings/impl/settings_system_data.cpp
View File

@@ -128,7 +128,7 @@ namespace ams::settings::impl {
AMS_ASSERT(succeeded);
AMS_UNUSED(succeeded);
return ResultSuccess();
R_SUCCEED();
}
LazyFileAccessor &GetLazyFileAccessor() {

20
libraries/libstratosphere/source/settings/impl/settings_system_save_data.cpp
View File

@@ -92,7 +92,7 @@ namespace ams::settings::impl {
m_is_activated = true;
}
return ResultSuccess();
R_SUCCEED();
}
Result LazyFileAccessor::Commit(const char *name, bool synchronous) {
@@ -113,7 +113,7 @@ namespace ams::settings::impl {
m_timer_event.StartOneShot(TimeSpan::FromMilliSeconds(LazyWriterDelayMilliSeconds));
}
return ResultSuccess();
R_SUCCEED();
}
Result LazyFileAccessor::Create(const char *name, s64 size) {
@@ -157,7 +157,7 @@ namespace ams::settings::impl {
/* Start the timer to write. */
m_timer_event.StartOneShot(TimeSpan::FromMilliSeconds(LazyWriterDelayMilliSeconds));
return ResultSuccess();
R_SUCCEED();
}
Result LazyFileAccessor::Open(const char *name, int mode) {
@@ -177,7 +177,7 @@ namespace ams::settings::impl {
if (m_open_mode == mode || m_open_mode == fs::OpenMode_Read) {
m_is_busy = true;
m_open_mode = mode;
return ResultSuccess();
R_SUCCEED();
}
caches = false;
}
@@ -212,7 +212,7 @@ namespace ams::settings::impl {
m_is_busy = true;
m_open_mode = mode;
return ResultSuccess();
R_SUCCEED();
}
void LazyFileAccessor::Close() {
@@ -238,7 +238,7 @@ namespace ams::settings::impl {
std::memcpy(dst, m_buffer + offset, size);
return ResultSuccess();
R_SUCCEED();
}
Result LazyFileAccessor::Write(s64 offset, const void *src, size_t size) {
@@ -272,7 +272,7 @@ namespace ams::settings::impl {
m_size = size;
}
return ResultSuccess();
R_SUCCEED();
}
Result LazyFileAccessor::SetFileSize(s64 size) {
@@ -310,7 +310,7 @@ namespace ams::settings::impl {
/* Update state. */
m_is_file_size_changed = prev_file_size != size;
m_file_size = size;
return ResultSuccess();
R_SUCCEED();
}
void LazyFileAccessor::ThreadFunc(void *arg) {
@@ -402,7 +402,7 @@ namespace ams::settings::impl {
R_TRY(fs::CommitSaveData(m_mount_name));
}
return ResultSuccess();
R_SUCCEED();
}
}
@@ -493,7 +493,7 @@ namespace ams::settings::impl {
Result SystemSaveData::Flush() {
/* N doesn't do anything here. */
return ResultSuccess();
R_SUCCEED();
}
Result SystemSaveData::SetFileSize(s64 size) {