mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-06-05 01:03:43 -04:00
Code Issues Projects Releases Packages 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

10
libraries/libstratosphere/source/sm/sm_api.cpp
View file

@ -47,24 +47,24 @@ namespace ams::sm {
/* Ordinary SM API. */
Result GetServiceHandle(os::NativeHandle *out, ServiceName name) {
return smGetServiceOriginal(out, impl::ConvertName(name));
R_RETURN(smGetServiceOriginal(out, impl::ConvertName(name)));
}
Result RegisterService(os::NativeHandle *out, ServiceName name, size_t max_sessions, bool is_light) {
return smRegisterService(out, impl::ConvertName(name), is_light, static_cast<int>(max_sessions));
R_RETURN(smRegisterService(out, impl::ConvertName(name), is_light, static_cast<int>(max_sessions)));
}
Result UnregisterService(ServiceName name) {
return smUnregisterService(impl::ConvertName(name));
R_RETURN(smUnregisterService(impl::ConvertName(name)));
}
/* Atmosphere extensions. */
Result HasService(bool *out, ServiceName name) {
return smAtmosphereHasService(out, impl::ConvertName(name));
R_RETURN(smAtmosphereHasService(out, impl::ConvertName(name)));
}
Result WaitService(ServiceName name) {
return smAtmosphereWaitService(impl::ConvertName(name));
R_RETURN(smAtmosphereWaitService(impl::ConvertName(name)));
}
#else
Result Initialize() {

8
libraries/libstratosphere/source/sm/sm_manager_api.cpp
View file

@ -26,20 +26,20 @@ namespace ams::sm::manager {
/* Manager API. */
Result RegisterProcess(os::ProcessId process_id, ncm::ProgramId program_id, cfg::OverrideStatus status, const void *acid, size_t acid_size, const void *aci, size_t aci_size) {
static_assert(sizeof(status) == sizeof(CfgOverrideStatus), "CfgOverrideStatus definition");
return smManagerAtmosphereRegisterProcess(static_cast<u64>(process_id), static_cast<u64>(program_id), reinterpret_cast<const CfgOverrideStatus *>(std::addressof(status)), acid, acid_size, aci, aci_size);
R_RETURN(smManagerAtmosphereRegisterProcess(static_cast<u64>(process_id), static_cast<u64>(program_id), reinterpret_cast<const CfgOverrideStatus *>(std::addressof(status)), acid, acid_size, aci, aci_size));
}
Result UnregisterProcess(os::ProcessId process_id) {
return smManagerUnregisterProcess(static_cast<u64>(process_id));
R_RETURN(smManagerUnregisterProcess(static_cast<u64>(process_id)));
}
/* Atmosphere extensions. */
Result EndInitialDefers() {
return smManagerAtmosphereEndInitialDefers();
R_RETURN(smManagerAtmosphereEndInitialDefers());
}
Result HasMitm(bool *out, ServiceName name) {
return smManagerAtmosphereHasMitm(out, impl::ConvertName(name));
R_RETURN(smManagerAtmosphereHasMitm(out, impl::ConvertName(name)));
}
#endif

18
libraries/libstratosphere/source/sm/sm_mitm_api.cpp
View file

@ -22,35 +22,35 @@ namespace ams::sm::mitm {
#if AMS_SF_MITM_SUPPORTED
/* Mitm API. */
Result InstallMitm(os::NativeHandle *out_port, os::NativeHandle *out_query, ServiceName name) {
return impl::DoWithPerThreadSession([&](TipcService *fwd) {
return smAtmosphereMitmInstall(fwd, out_port, out_query, impl::ConvertName(name));
});
R_RETURN(impl::DoWithPerThreadSession([&](TipcService *fwd) {
R_RETURN(smAtmosphereMitmInstall(fwd, out_port, out_query, impl::ConvertName(name)));
}));
}
Result UninstallMitm(ServiceName name) {
return smAtmosphereMitmUninstall(impl::ConvertName(name));
R_RETURN(smAtmosphereMitmUninstall(impl::ConvertName(name)));
}
Result DeclareFutureMitm(ServiceName name) {
return smAtmosphereMitmDeclareFuture(impl::ConvertName(name));
R_RETURN(smAtmosphereMitmDeclareFuture(impl::ConvertName(name)));
}
Result ClearFutureMitm(ServiceName name) {
return smAtmosphereMitmClearFuture(impl::ConvertName(name));
R_RETURN(smAtmosphereMitmClearFuture(impl::ConvertName(name)));
}
Result AcknowledgeSession(Service *out_service, MitmProcessInfo *out_info, ServiceName name) {
return impl::DoWithMitmAcknowledgementSession([&]() {
return smAtmosphereMitmAcknowledgeSession(out_service, reinterpret_cast<void *>(out_info), impl::ConvertName(name));
R_RETURN(smAtmosphereMitmAcknowledgeSession(out_service, reinterpret_cast<void *>(out_info), impl::ConvertName(name)));
});
}
Result HasMitm(bool *out, ServiceName name) {
return smAtmosphereHasMitm(out, impl::ConvertName(name));
R_RETURN(smAtmosphereHasMitm(out, impl::ConvertName(name)));
}
Result WaitMitm(ServiceName name) {
return smAtmosphereWaitMitm(impl::ConvertName(name));
R_RETURN(smAtmosphereWaitMitm(impl::ConvertName(name)));
}
#endif
#endif

4
libraries/libstratosphere/source/sm/sm_utils.hpp
View file

@ -35,7 +35,7 @@ namespace ams::sm::impl {
R_ABORT_UNLESS(smAtmosphereMitmInitialize());
ON_SCOPE_EXIT { smAtmosphereMitmExit(); };
return f();
R_RETURN(f());
}
}
@ -48,7 +48,7 @@ namespace ams::sm::impl {
}
{
ON_SCOPE_EXIT { smAtmosphereCloseSession(std::addressof(srv)); };
return f(std::addressof(srv));
R_RETURN(f(std::addressof(srv)));
}
}