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

20
libraries/libstratosphere/source/updater/updater_api.cpp
View File

@@ -124,15 +124,15 @@ namespace ams::updater {
} R_END_TRY_CATCH;
/* We've either just verified or just repaired. Either way, we don't need to verify any more. */
return SetVerificationNeeded(mode, work_buffer, work_buffer_size, false);
R_RETURN(SetVerificationNeeded(mode, work_buffer, work_buffer_size, false));
}
Result VerifyBootImages(ncm::SystemDataId data_id, BootModeType mode, void *work_buffer, size_t work_buffer_size, BootImageUpdateType boot_image_update_type) {
switch (mode) {
case BootModeType::Normal:
return VerifyBootImagesNormal(data_id, work_buffer, work_buffer_size, boot_image_update_type);
R_RETURN(VerifyBootImagesNormal(data_id, work_buffer, work_buffer_size, boot_image_update_type));
case BootModeType::Safe:
return VerifyBootImagesSafe(data_id, work_buffer, work_buffer_size, boot_image_update_type);
R_RETURN(VerifyBootImagesSafe(data_id, work_buffer, work_buffer_size, boot_image_update_type));
AMS_UNREACHABLE_DEFAULT_CASE();
}
}
@@ -438,7 +438,7 @@ namespace ams::updater {
u8 file_hash[crypto::Sha256Generator::HashSize];
crypto::GenerateSha256(file_hash, sizeof(file_hash), bct, BctSize);
return CompareHash(file_hash, stored_hash, sizeof(file_hash));
R_RETURN(CompareHash(file_hash, stored_hash, sizeof(file_hash)));
}
Result GetPackage2Hash(void *dst_hash, size_t package2_size, void *work_buffer, size_t work_buffer_size, Package2Type which) {
@@ -446,7 +446,7 @@ namespace ams::updater {
R_TRY(accessor.Initialize());
ON_SCOPE_EXIT { accessor.Finalize(); };
return accessor.GetHash(dst_hash, package2_size, work_buffer, work_buffer_size, Package2Partition::Package2);
R_RETURN(accessor.GetHash(dst_hash, package2_size, work_buffer, work_buffer_size, Package2Partition::Package2));
}
Result WritePackage2(void *work_buffer, size_t work_buffer_size, Package2Type which, BootImageUpdateType boot_image_update_type) {
@@ -454,7 +454,7 @@ namespace ams::updater {
R_TRY(accessor.Initialize());
ON_SCOPE_EXIT { accessor.Finalize(); };
return accessor.Write(GetPackage2Path(boot_image_update_type), work_buffer, work_buffer_size, Package2Partition::Package2);
R_RETURN(accessor.Write(GetPackage2Path(boot_image_update_type), work_buffer, work_buffer_size, Package2Partition::Package2));
}
Result CompareHash(const void *lhs, const void *rhs, size_t size) {
@@ -522,19 +522,19 @@ namespace ams::updater {
}
Result MarkVerifyingRequired(BootModeType mode, void *work_buffer, size_t work_buffer_size) {
return SetVerificationNeeded(mode, work_buffer, work_buffer_size, true);
R_RETURN(SetVerificationNeeded(mode, work_buffer, work_buffer_size, true));
}
Result MarkVerified(BootModeType mode, void *work_buffer, size_t work_buffer_size) {
return SetVerificationNeeded(mode, work_buffer, work_buffer_size, false);
R_RETURN(SetVerificationNeeded(mode, work_buffer, work_buffer_size, false));
}
Result UpdateBootImagesFromPackage(ncm::SystemDataId data_id, BootModeType mode, void *work_buffer, size_t work_buffer_size, BootImageUpdateType boot_image_update_type) {
switch (mode) {
case BootModeType::Normal:
return UpdateBootImagesNormal(data_id, work_buffer, work_buffer_size, boot_image_update_type);
R_RETURN(UpdateBootImagesNormal(data_id, work_buffer, work_buffer_size, boot_image_update_type));
case BootModeType::Safe:
return UpdateBootImagesSafe(data_id, work_buffer, work_buffer_size, boot_image_update_type);
R_RETURN(UpdateBootImagesSafe(data_id, work_buffer, work_buffer_size, boot_image_update_type));
AMS_UNREACHABLE_DEFAULT_CASE();
}
}

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) {

13
libraries/libstratosphere/source/updater/updater_bis_management.hpp
View File

@@ -140,32 +140,31 @@ namespace ams::updater {
const auto entry = FindEntry(which);
AMS_ABORT_UNLESS(size >= entry->size);
R_TRY(BisAccessor::Read(dst, entry->size, entry->offset));
ON_RESULT_SUCCESS { *out_size = entry->size; };
*out_size = entry->size;
R_SUCCEED();
R_RETURN(BisAccessor::Read(dst, entry->size, entry->offset));
}
Result Write(const void *src, size_t size, EnumType which) {
const auto entry = FindEntry(which);
AMS_ABORT_UNLESS(size <= entry->size);
AMS_ABORT_UNLESS((size % BisAccessor::SectorAlignment) == 0);
return BisAccessor::Write(entry->offset, src, size);
R_RETURN(BisAccessor::Write(entry->offset, src, size));
}
Result Write(const char *bip_path, void *work_buffer, size_t work_buffer_size, EnumType which) {
const auto entry = FindEntry(which);
return BisAccessor::Write(entry->offset, entry->size, bip_path, work_buffer, work_buffer_size);
R_RETURN(BisAccessor::Write(entry->offset, entry->size, bip_path, work_buffer, work_buffer_size));
}
Result Clear(void *work_buffer, size_t work_buffer_size, EnumType which) {
const auto entry = FindEntry(which);
return BisAccessor::Clear(entry->offset, entry->size, work_buffer, work_buffer_size);
R_RETURN(BisAccessor::Clear(entry->offset, entry->size, work_buffer, work_buffer_size));
}
Result GetHash(void *dst, u64 hash_size, void *work_buffer, size_t work_buffer_size, EnumType which) {
const auto entry = FindEntry(which);
return BisAccessor::GetHash(dst, entry->offset, entry->size, hash_size, work_buffer, work_buffer_size);
R_RETURN(BisAccessor::GetHash(dst, entry->offset, entry->size, hash_size, work_buffer, work_buffer_size));
}
};

4
libraries/libstratosphere/source/updater/updater_bis_save.cpp
View File

@@ -45,11 +45,11 @@ namespace ams::updater {
Result BisSave::Load() {
size_t read_size;
return m_accessor.Read(std::addressof(read_size), m_save_buffer, SaveSize, Boot0Partition::BctSave);
R_RETURN(m_accessor.Read(std::addressof(read_size), m_save_buffer, SaveSize, Boot0Partition::BctSave));
}
Result BisSave::Save() {
return m_accessor.Write(m_save_buffer, SaveSize, Boot0Partition::BctSave);
R_RETURN(m_accessor.Write(m_save_buffer, SaveSize, Boot0Partition::BctSave));
}
bool BisSave::GetNeedsVerification(BootModeType mode) {

2
libraries/libstratosphere/source/updater/updater_files.cpp
View File

@@ -27,7 +27,7 @@ namespace ams::updater {
ON_SCOPE_EXIT { fs::CloseFile(file); };
std::memset(dst, 0, dst_size);
return fs::ReadFile(out_size, file, 0, dst, dst_size, fs::ReadOption());
R_RETURN(fs::ReadFile(out_size, file, 0, dst, dst_size, fs::ReadOption()));
}
Result GetFileHash(size_t *out_size, void *dst_hash, const char *path, void *work_buffer, size_t work_buffer_size) {