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/source/pm/pm_dmnt_api.cpp
View File

@@ -22,19 +22,19 @@ namespace ams::pm::dmnt {
/* Debug Monitor API. */
#if defined(ATMOSPHERE_OS_HORIZON)
Result StartProcess(os::ProcessId process_id) {
return pmdmntStartProcess(static_cast<u64>(process_id));
R_RETURN(pmdmntStartProcess(static_cast<u64>(process_id)));
}
Result GetProgramId(ncm::ProgramId *out_program_id, os::ProcessId process_id) {
return pmdmntGetProgramId(reinterpret_cast<u64 *>(out_program_id), static_cast<u64>(process_id));
R_RETURN(pmdmntGetProgramId(reinterpret_cast<u64 *>(out_program_id), static_cast<u64>(process_id)));
}
Result GetProcessId(os::ProcessId *out_process_id, const ncm::ProgramId program_id) {
return pmdmntGetProcessId(reinterpret_cast<u64 *>(out_process_id), static_cast<u64>(program_id));
R_RETURN(pmdmntGetProcessId(reinterpret_cast<u64 *>(out_process_id), static_cast<u64>(program_id)));
}
Result GetApplicationProcessId(os::ProcessId *out_process_id) {
return pmdmntGetApplicationProcessId(reinterpret_cast<u64 *>(out_process_id));
R_RETURN(pmdmntGetApplicationProcessId(reinterpret_cast<u64 *>(out_process_id)));
}
Result HookToCreateApplicationProcess(os::NativeHandle *out_handle) {
@@ -49,13 +49,13 @@ namespace ams::pm::dmnt {
*out_loc = {};
*out_status = {};
static_assert(sizeof(*out_status) == sizeof(CfgOverrideStatus));
return pmdmntAtmosphereGetProcessInfo(out_handle, reinterpret_cast<NcmProgramLocation *>(out_loc), reinterpret_cast<CfgOverrideStatus *>(out_status), static_cast<u64>(process_id));
R_RETURN(pmdmntAtmosphereGetProcessInfo(out_handle, reinterpret_cast<NcmProgramLocation *>(out_loc), reinterpret_cast<CfgOverrideStatus *>(out_status), static_cast<u64>(process_id)));
}
Result AtmosphereGetCurrentLimitInfo(u64 *out_current_value, u64 *out_limit_value, ResourceLimitGroup group, svc::LimitableResource resource) {
*out_current_value = 0;
*out_limit_value = 0;
return pmdmntAtmosphereGetCurrentLimitInfo(out_current_value, out_limit_value, group, resource);
R_RETURN(pmdmntAtmosphereGetCurrentLimitInfo(out_current_value, out_limit_value, group, resource));
}
#endif

12
libraries/libstratosphere/source/pm/pm_info_api.cpp
View File

@@ -21,28 +21,28 @@ namespace ams::pm::info {
/* Information API. */
#if defined(ATMOSPHERE_OS_HORIZON)
Result GetProgramId(ncm::ProgramId *out_program_id, os::ProcessId process_id) {
return pminfoGetProgramId(reinterpret_cast<u64 *>(out_program_id), static_cast<u64>(process_id));
R_RETURN(pminfoGetProgramId(reinterpret_cast<u64 *>(out_program_id), static_cast<u64>(process_id)));
}
Result GetProcessId(os::ProcessId *out_process_id, ncm::ProgramId program_id) {
return pminfoAtmosphereGetProcessId(reinterpret_cast<u64 *>(out_process_id), static_cast<u64>(program_id));
R_RETURN(pminfoAtmosphereGetProcessId(reinterpret_cast<u64 *>(out_process_id), static_cast<u64>(program_id)));
}
Result GetAppletCurrentResourceLimitValues(pm::ResourceLimitValues *out) {
static_assert(sizeof(pm::ResourceLimitValues) == sizeof(::PmResourceLimitValues));
return pminfoGetAppletCurrentResourceLimitValues(reinterpret_cast<PmResourceLimitValues *>(out));
R_RETURN(pminfoGetAppletCurrentResourceLimitValues(reinterpret_cast<PmResourceLimitValues *>(out)));
}
Result GetAppletPeakResourceLimitValues(pm::ResourceLimitValues *out) {
static_assert(sizeof(pm::ResourceLimitValues) == sizeof(::PmResourceLimitValues));
return pminfoGetAppletPeakResourceLimitValues(reinterpret_cast<PmResourceLimitValues *>(out));
R_RETURN(pminfoGetAppletPeakResourceLimitValues(reinterpret_cast<PmResourceLimitValues *>(out)));
}
Result GetProcessInfo(ncm::ProgramLocation *out_loc, cfg::OverrideStatus *out_status, os::ProcessId process_id) {
*out_loc = {};
*out_status = {};
static_assert(sizeof(*out_status) == sizeof(CfgOverrideStatus));
return pminfoAtmosphereGetProcessInfo(reinterpret_cast<NcmProgramLocation *>(out_loc), reinterpret_cast<CfgOverrideStatus *>(out_status), static_cast<u64>(process_id));
R_RETURN(pminfoAtmosphereGetProcessInfo(reinterpret_cast<NcmProgramLocation *>(out_loc), reinterpret_cast<CfgOverrideStatus *>(out_status), static_cast<u64>(process_id)));
}
bool HasLaunchedBootProgram(ncm::ProgramId program_id) {
@@ -65,7 +65,7 @@ namespace ams::pm::info {
os::ProcessId process_id;
R_TRY(GetProcessId(std::addressof(process_id), program_id));
return IsHblProcessId(out, process_id);
R_RETURN(IsHblProcessId(out, process_id));
}
#endif

14
libraries/libstratosphere/source/pm/pm_shell_api.cpp
View File

@@ -22,11 +22,11 @@ namespace ams::pm::shell {
Result WEAK_SYMBOL LaunchProgram(os::ProcessId *out, const ncm::ProgramLocation &loc, u32 launch_flags) {
static_assert(sizeof(ncm::ProgramLocation) == sizeof(NcmProgramLocation));
static_assert(alignof(ncm::ProgramLocation) == alignof(NcmProgramLocation));
return pmshellLaunchProgram(launch_flags, reinterpret_cast<const NcmProgramLocation *>(std::addressof(loc)), reinterpret_cast<u64 *>(out));
R_RETURN(pmshellLaunchProgram(launch_flags, reinterpret_cast<const NcmProgramLocation *>(std::addressof(loc)), reinterpret_cast<u64 *>(out)));
}
Result TerminateProcess(os::ProcessId process_id) {
return ::pmshellTerminateProcess(static_cast<u64>(process_id));
R_RETURN(::pmshellTerminateProcess(static_cast<u64>(process_id)));
}
Result GetProcessEventEvent(os::SystemEvent *out) {
@@ -38,24 +38,24 @@ namespace ams::pm::shell {
Result GetProcessEventInfo(ProcessEventInfo *out) {
static_assert(sizeof(*out) == sizeof(::PmProcessEventInfo));
return ::pmshellGetProcessEventInfo(reinterpret_cast<::PmProcessEventInfo *>(out));
R_RETURN(::pmshellGetProcessEventInfo(reinterpret_cast<::PmProcessEventInfo *>(out)));
}
Result GetApplicationProcessIdForShell(os::ProcessId *out) {
static_assert(sizeof(*out) == sizeof(u64));
return ::pmshellGetApplicationProcessIdForShell(reinterpret_cast<u64 *>(out));
R_RETURN(::pmshellGetApplicationProcessIdForShell(reinterpret_cast<u64 *>(out)));
}
Result BoostSystemMemoryResourceLimit(u64 size) {
return ::pmshellBoostSystemMemoryResourceLimit(size);
R_RETURN(::pmshellBoostSystemMemoryResourceLimit(size));
}
Result BoostApplicationThreadResourceLimit() {
return ::pmshellBoostApplicationThreadResourceLimit();
R_RETURN(::pmshellBoostApplicationThreadResourceLimit());
}
Result BoostSystemThreadResourceLimit() {
return ::pmshellBoostSystemThreadResourceLimit();
R_RETURN(::pmshellBoostSystemThreadResourceLimit());
}
#endif