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/include/stratosphere/lr/lr_add_on_content_location_resolver.hpp
View File

@@ -44,31 +44,31 @@ namespace ams::lr {
/* Actual commands. */
Result ResolveAddOnContentPath(Path *out, ncm::DataId id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->ResolveAddOnContentPath(out, id);
R_RETURN(m_interface->ResolveAddOnContentPath(out, id));
}
Result RegisterAddOnContentStorage(ncm::DataId id, ncm::ApplicationId application_id, ncm::StorageId storage_id) {
AMS_ASSERT(m_interface != nullptr);
if (hos::GetVersion() >= hos::Version_9_0_0) {
return m_interface->RegisterAddOnContentStorage(id, application_id, storage_id);
R_RETURN(m_interface->RegisterAddOnContentStorage(id, application_id, storage_id));
} else {
return m_interface->RegisterAddOnContentStorageDeprecated(id, storage_id);
R_RETURN(m_interface->RegisterAddOnContentStorageDeprecated(id, storage_id));
}
}
Result UnregisterAllAddOnContentPath() {
AMS_ASSERT(m_interface != nullptr);
return m_interface->UnregisterAllAddOnContentPath();
R_RETURN(m_interface->UnregisterAllAddOnContentPath());
}
Result RefreshApplicationAddOnContent(const ncm::ApplicationId *ids, size_t num_ids) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->RefreshApplicationAddOnContent(sf::InArray<ncm::ApplicationId>(ids, num_ids));
R_RETURN(m_interface->RefreshApplicationAddOnContent(sf::InArray<ncm::ApplicationId>(ids, num_ids)));
}
Result UnregisterApplicationAddOnContent(ncm::ApplicationId id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->UnregisterApplicationAddOnContent(id);
R_RETURN(m_interface->UnregisterApplicationAddOnContent(id));
}
};

30
libraries/libstratosphere/include/stratosphere/lr/lr_location_resolver.hpp
View File

@@ -43,7 +43,7 @@ namespace ams::lr {
public:
Result ResolveProgramPath(Path *out, ncm::ProgramId id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->ResolveProgramPath(out, id);
R_RETURN(m_interface->ResolveProgramPath(out, id));
}
void RedirectProgramPath(const Path &path, ncm::ProgramId id) {
@@ -53,17 +53,17 @@ namespace ams::lr {
Result ResolveApplicationControlPath(Path *out, ncm::ProgramId id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->ResolveApplicationControlPath(out, id);
R_RETURN(m_interface->ResolveApplicationControlPath(out, id));
}
Result ResolveApplicationHtmlDocumentPath(Path *out, ncm::ProgramId id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->ResolveApplicationHtmlDocumentPath(out, id);
R_RETURN(m_interface->ResolveApplicationHtmlDocumentPath(out, id));
}
Result ResolveDataPath(Path *out, ncm::DataId id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->ResolveDataPath(out, id);
R_RETURN(m_interface->ResolveDataPath(out, id));
}
void RedirectApplicationControlPath(const Path &path, ncm::ProgramId id, ncm::ProgramId owner_id) {
@@ -86,7 +86,7 @@ namespace ams::lr {
Result ResolveApplicationLegalInformationPath(Path *out, ncm::ProgramId id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->ResolveApplicationLegalInformationPath(out, id);
R_RETURN(m_interface->ResolveApplicationLegalInformationPath(out, id));
}
void RedirectApplicationLegalInformationPath(const Path &path, ncm::ProgramId id, ncm::ProgramId owner_id) {
@@ -100,7 +100,7 @@ namespace ams::lr {
Result Refresh() {
AMS_ASSERT(m_interface != nullptr);
return m_interface->Refresh();
R_RETURN(m_interface->Refresh());
}
void RedirectApplicationProgramPath(const Path &path, ncm::ProgramId id, ncm::ProgramId owner_id) {
@@ -115,41 +115,41 @@ namespace ams::lr {
Result ClearApplicationRedirection() {
AMS_ASSERT(m_interface != nullptr);
AMS_ASSERT(hos::GetVersion() < hos::Version_9_0_0);
return this->ClearApplicationRedirection(nullptr, 0);
R_RETURN(this->ClearApplicationRedirection(nullptr, 0));
}
Result ClearApplicationRedirection(const ncm::ProgramId *excluding_ids, size_t num_ids) {
AMS_ASSERT(m_interface != nullptr);
if (hos::GetVersion() >= hos::Version_9_0_0) {
return m_interface->ClearApplicationRedirection(sf::InArray<ncm::ProgramId>(excluding_ids, num_ids));
R_RETURN(m_interface->ClearApplicationRedirection(sf::InArray<ncm::ProgramId>(excluding_ids, num_ids)));
} else {
return m_interface->ClearApplicationRedirectionDeprecated();
R_RETURN(m_interface->ClearApplicationRedirectionDeprecated());
}
}
Result EraseProgramRedirection(ncm::ProgramId id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->EraseProgramRedirection(id);
R_RETURN(m_interface->EraseProgramRedirection(id));
}
Result EraseApplicationControlRedirection(ncm::ProgramId id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->EraseApplicationControlRedirection(id);
R_RETURN(m_interface->EraseApplicationControlRedirection(id));
}
Result EraseApplicationHtmlDocumentRedirection(ncm::ProgramId id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->EraseApplicationHtmlDocumentRedirection(id);
R_RETURN(m_interface->EraseApplicationHtmlDocumentRedirection(id));
}
Result EraseApplicationLegalInformationRedirection(ncm::ProgramId id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->EraseApplicationLegalInformationRedirection(id);
R_RETURN(m_interface->EraseApplicationLegalInformationRedirection(id));
}
Result ResolveProgramPathForDebug(Path *out, ncm::ProgramId id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->ResolveProgramPathForDebug(out, id);
R_RETURN(m_interface->ResolveProgramPathForDebug(out, id));
}
void RedirectProgramPathForDebug(const Path &path, ncm::ProgramId id) {
@@ -168,7 +168,7 @@ namespace ams::lr {
Result EraseProgramRedirectionForDebug(ncm::ProgramId id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->EraseProgramRedirectionForDebug(id);
R_RETURN(m_interface->EraseProgramRedirectionForDebug(id));
}
};

20
libraries/libstratosphere/include/stratosphere/lr/lr_registered_location_resolver.hpp
View File

@@ -44,21 +44,21 @@ namespace ams::lr {
/* Actual commands. */
Result ResolveProgramPath(Path *out, ncm::ProgramId id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->ResolveProgramPath(out, id);
R_RETURN(m_interface->ResolveProgramPath(out, id));
}
Result RegisterProgramPath(const Path &path, ncm::ProgramId id, ncm::ProgramId owner_id) {
AMS_ASSERT(m_interface != nullptr);
if (hos::GetVersion() >= hos::Version_9_0_0) {
return m_interface->RegisterProgramPath(path, id, owner_id);
R_RETURN(m_interface->RegisterProgramPath(path, id, owner_id));
} else {
return m_interface->RegisterProgramPathDeprecated(path, id);
R_RETURN(m_interface->RegisterProgramPathDeprecated(path, id));
}
}
Result UnregisterProgramPath(ncm::ProgramId id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->UnregisterProgramPath(id);
R_RETURN(m_interface->UnregisterProgramPath(id));
}
void RedirectProgramPath(const Path &path, ncm::ProgramId id, ncm::ProgramId owner_id) {
@@ -72,21 +72,21 @@ namespace ams::lr {
Result ResolveHtmlDocumentPath(Path *out, ncm::ProgramId id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->ResolveHtmlDocumentPath(out, id);
R_RETURN(m_interface->ResolveHtmlDocumentPath(out, id));
}
Result RegisterHtmlDocumentPath(const Path &path, ncm::ProgramId id, ncm::ProgramId owner_id) {
AMS_ASSERT(m_interface != nullptr);
if (hos::GetVersion() >= hos::Version_9_0_0) {
return m_interface->RegisterHtmlDocumentPath(path, id, owner_id);
R_RETURN(m_interface->RegisterHtmlDocumentPath(path, id, owner_id));
} else {
return m_interface->RegisterHtmlDocumentPathDeprecated(path, id);
R_RETURN(m_interface->RegisterHtmlDocumentPathDeprecated(path, id));
}
}
Result UnregisterHtmlDocumentPath(ncm::ProgramId id) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->UnregisterHtmlDocumentPath(id);
R_RETURN(m_interface->UnregisterHtmlDocumentPath(id));
}
void RedirectHtmlDocumentPath(const Path &path, ncm::ProgramId id, ncm::ProgramId owner_id) {
@@ -100,12 +100,12 @@ namespace ams::lr {
Result Refresh() {
AMS_ASSERT(m_interface != nullptr);
return m_interface->Refresh();
R_RETURN(m_interface->Refresh());
}
Result RefreshExcluding(const ncm::ProgramId *excluding_ids, size_t num_ids) {
AMS_ASSERT(m_interface != nullptr);
return m_interface->RefreshExcluding(sf::InArray<ncm::ProgramId>(excluding_ids, num_ids));
R_RETURN(m_interface->RefreshExcluding(sf::InArray<ncm::ProgramId>(excluding_ids, num_ids)));
}
};