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

54
libraries/libstratosphere/include/stratosphere/ncm/ncm_content_storage.hpp
View File

@@ -49,37 +49,37 @@ namespace ams::ncm {
Result CreatePlaceHolder(PlaceHolderId placeholder_id, ContentId content_id, s64 size) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->CreatePlaceHolder(placeholder_id, content_id, size);
R_RETURN(m_interface->CreatePlaceHolder(placeholder_id, content_id, size));
}
Result DeletePlaceHolder(PlaceHolderId placeholder_id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->DeletePlaceHolder(placeholder_id);
R_RETURN(m_interface->DeletePlaceHolder(placeholder_id));
}
Result HasPlaceHolder(bool *out, PlaceHolderId placeholder_id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->HasPlaceHolder(out, placeholder_id);
R_RETURN(m_interface->HasPlaceHolder(out, placeholder_id));
}
Result WritePlaceHolder(PlaceHolderId placeholder_id, s64 offset, const void *buf, size_t size) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->WritePlaceHolder(placeholder_id, offset, sf::InBuffer(buf, size));
R_RETURN(m_interface->WritePlaceHolder(placeholder_id, offset, sf::InBuffer(buf, size)));
}
Result Register(PlaceHolderId placeholder_id, ContentId content_id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->Register(placeholder_id, content_id);
R_RETURN(m_interface->Register(placeholder_id, content_id));
}
Result Delete(ContentId content_id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->Delete(content_id);
R_RETURN(m_interface->Delete(content_id));
}
Result Has(bool *out, ContentId content_id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->Has(out, content_id);
R_RETURN(m_interface->Has(out, content_id));
}
void GetPath(Path *out, ContentId content_id) {
@@ -94,52 +94,52 @@ namespace ams::ncm {
Result CleanupAllPlaceHolder() {
AMS_ASSERT(m_interface != nullptr);
return m_interface->CleanupAllPlaceHolder();
R_RETURN(m_interface->CleanupAllPlaceHolder());
}
Result ListPlaceHolder(s32 *out_count, PlaceHolderId *out_list, size_t out_list_size) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->ListPlaceHolder(out_count, sf::OutArray<PlaceHolderId>(out_list, out_list_size));
R_RETURN(m_interface->ListPlaceHolder(out_count, sf::OutArray<PlaceHolderId>(out_list, out_list_size)));
}
Result GetContentCount(s32 *out_count) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->GetContentCount(out_count);
R_RETURN(m_interface->GetContentCount(out_count));
}
Result ListContentId(s32 *out_count, ContentId *out_list, size_t out_list_size, s32 offset) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->ListContentId(out_count, sf::OutArray<ContentId>(out_list, out_list_size), offset);
R_RETURN(m_interface->ListContentId(out_count, sf::OutArray<ContentId>(out_list, out_list_size), offset));
}
Result GetSize(s64 *out_size, ContentId content_id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->GetSizeFromContentId(out_size, content_id);
R_RETURN(m_interface->GetSizeFromContentId(out_size, content_id));
}
Result GetSize(s64 *out_size, PlaceHolderId placeholder_id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->GetSizeFromPlaceHolderId(out_size, placeholder_id);
R_RETURN(m_interface->GetSizeFromPlaceHolderId(out_size, placeholder_id));
}
Result DisableForcibly() {
AMS_ASSERT(m_interface != nullptr);
return m_interface->DisableForcibly();
R_RETURN(m_interface->DisableForcibly());
}
Result RevertToPlaceHolder(PlaceHolderId placeholder_id, ContentId old_content_id, ContentId new_content_id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->RevertToPlaceHolder(placeholder_id, old_content_id, new_content_id);
R_RETURN(m_interface->RevertToPlaceHolder(placeholder_id, old_content_id, new_content_id));
}
Result SetPlaceHolderSize(PlaceHolderId placeholder_id, s64 size) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->SetPlaceHolderSize(placeholder_id, size);
R_RETURN(m_interface->SetPlaceHolderSize(placeholder_id, size));
}
Result ReadContentIdFile(void *dst, size_t size, ContentId content_id, s64 offset) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->ReadContentIdFile(sf::OutBuffer(dst, size), content_id, offset);
R_RETURN(m_interface->ReadContentIdFile(sf::OutBuffer(dst, size), content_id, offset));
}
Result GetRightsId(ncm::RightsId *out_rights_id, PlaceHolderId placeholder_id) {
@@ -147,11 +147,11 @@ namespace ams::ncm {
const auto vers = hos::GetVersion();
if (vers >= hos::Version_3_0_0) {
return m_interface->GetRightsIdFromPlaceHolderId(out_rights_id, placeholder_id);
R_RETURN(m_interface->GetRightsIdFromPlaceHolderId(out_rights_id, placeholder_id));
} else {
AMS_ABORT_UNLESS(vers >= hos::Version_2_0_0);
*out_rights_id = {};
return m_interface->GetRightsIdFromPlaceHolderIdDeprecated(std::addressof(out_rights_id->id), placeholder_id);
R_RETURN(m_interface->GetRightsIdFromPlaceHolderIdDeprecated(std::addressof(out_rights_id->id), placeholder_id));
}
}
@@ -160,42 +160,42 @@ namespace ams::ncm {
const auto vers = hos::GetVersion();
if (vers >= hos::Version_3_0_0) {
return m_interface->GetRightsIdFromContentId(out_rights_id, content_id);
R_RETURN(m_interface->GetRightsIdFromContentId(out_rights_id, content_id));
} else {
AMS_ABORT_UNLESS(vers >= hos::Version_2_0_0);
*out_rights_id = {};
return m_interface->GetRightsIdFromContentIdDeprecated(std::addressof(out_rights_id->id), content_id);
R_RETURN(m_interface->GetRightsIdFromContentIdDeprecated(std::addressof(out_rights_id->id), content_id));
}
}
Result WriteContentForDebug(ContentId content_id, s64 offset, const void *buf, size_t size) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->WriteContentForDebug(content_id, offset, sf::InBuffer(buf, size));
R_RETURN(m_interface->WriteContentForDebug(content_id, offset, sf::InBuffer(buf, size)));
}
Result GetFreeSpaceSize(s64 *out_size) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->GetFreeSpaceSize(out_size);
R_RETURN(m_interface->GetFreeSpaceSize(out_size));
}
Result GetTotalSpaceSize(s64 *out_size) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->GetTotalSpaceSize(out_size);
R_RETURN(m_interface->GetTotalSpaceSize(out_size));
}
Result FlushPlaceHolder() {
AMS_ASSERT(m_interface != nullptr);
return m_interface->FlushPlaceHolder();
R_RETURN(m_interface->FlushPlaceHolder());
}
Result RepairInvalidFileAttribute() {
AMS_ASSERT(m_interface != nullptr);
return m_interface->RepairInvalidFileAttribute();
R_RETURN(m_interface->RepairInvalidFileAttribute());
}
Result GetRightsIdFromPlaceHolderIdWithCache(ncm::RightsId *out_rights_id, PlaceHolderId placeholder_id, ContentId cache_content_id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->GetRightsIdFromPlaceHolderIdWithCache(out_rights_id, placeholder_id, cache_content_id);
R_RETURN(m_interface->GetRightsIdFromPlaceHolderIdWithCache(out_rights_id, placeholder_id, cache_content_id));
}
};