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

ams: globally prefer R_RETURN to return for ams::Result

Browse Source
This commit is contained in:
Michael Scire
2022-03-26 14:48:33 -07:00
parent dd78ede99f
commit bbf22b4c60
325 changed files with 1955 additions and 1993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/libstratosphere/source/settings/settings_serial_number.cpp
View File

@@ -19,13 +19,13 @@
namespace ams::settings::factory {
Result GetSerialNumber(SerialNumber *out) {
const Result result = settings::impl::GetSerialNumber(out);
R_TRY_CATCH(settings::impl::GetSerialNumber(out)) {
/* It's not a fatal error if the calib filesystem is corrupted. */
R_CATCH_RETHROW(settings::ResultCalibrationDataFileSystemCorrupted)
R_CATCH_RETHROW(settings::ResultCalibrationDataCrcError)
} R_END_TRY_CATCH_WITH_ABORT_UNLESS;
if (!settings::ResultCalibrationDataFileSystemCorrupted::Includes(result) && !settings::ResultCalibrationDataCrcError::Includes(result)) {
R_ABORT_UNLESS(result);
}
return result;
R_SUCCEED();
}
}