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

8
libraries/libstratosphere/source/updater/updater_bis_management.cpp
View File

@@ -49,7 +49,7 @@ namespace ams::updater {
}
Result BisAccessor::Initialize() {
return fs::OpenBisPartition(std::addressof(m_storage), m_partition_id);
R_RETURN(fs::OpenBisPartition(std::addressof(m_storage), m_partition_id));
}
void BisAccessor::Finalize() {
@@ -58,12 +58,12 @@ namespace ams::updater {
Result BisAccessor::Read(void *dst, size_t size, u64 offset) {
AMS_ABORT_UNLESS((offset % SectorAlignment) == 0);
return m_storage->Read(static_cast<u32>(offset), dst, size);
R_RETURN(m_storage->Read(static_cast<u32>(offset), dst, size));
}
Result BisAccessor::Write(u64 offset, const void *src, size_t size) {
AMS_ABORT_UNLESS((offset % SectorAlignment) == 0);
return m_storage->Write(static_cast<u32>(offset), src, size);
R_RETURN(m_storage->Write(static_cast<u32>(offset), src, size));
}
Result BisAccessor::Write(u64 offset, size_t size, const char *bip_path, void *work_buffer, size_t work_buffer_size) {
@@ -149,7 +149,7 @@ namespace ams::updater {
size_t read_size;
R_TRY(this->Read(&read_size, eks_work_buffer, EksSize, Boot0Partition::Eks));
return this->UpdateEksManually(dst_bct, eks_work_buffer);
R_RETURN(this->UpdateEksManually(dst_bct, eks_work_buffer));
}
Result Boot0Accessor::UpdateEksManually(void *dst_bct, const void *src_eks) {