ams: replace most remaining operator & with std::addressof
This commit is contained in:
@@ -21,7 +21,7 @@ namespace ams::pm::bm {
|
||||
/* Both functions should be weakly linked, so that they can be overridden by ams::boot2 as needed. */
|
||||
BootMode WEAK_SYMBOL GetBootMode() {
|
||||
PmBootMode boot_mode = PmBootMode_Normal;
|
||||
R_ABORT_UNLESS(pmbmGetBootMode(&boot_mode));
|
||||
R_ABORT_UNLESS(pmbmGetBootMode(std::addressof(boot_mode)));
|
||||
return static_cast<BootMode>(boot_mode);
|
||||
}
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace ams::pm::dmnt {
|
||||
|
||||
Result HookToCreateApplicationProcess(os::NativeHandle *out_handle) {
|
||||
Event evt;
|
||||
R_TRY(pmdmntHookToCreateApplicationProcess(&evt));
|
||||
R_TRY(pmdmntHookToCreateApplicationProcess(std::addressof(evt)));
|
||||
*out_handle = evt.revent;
|
||||
return ResultSuccess();
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ namespace ams::pm::info {
|
||||
|
||||
bool HasLaunchedBootProgram(ncm::ProgramId program_id) {
|
||||
bool has_launched = false;
|
||||
R_ABORT_UNLESS(HasLaunchedBootProgram(&has_launched, program_id));
|
||||
R_ABORT_UNLESS(HasLaunchedBootProgram(std::addressof(has_launched), program_id));
|
||||
return has_launched;
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ namespace ams::pm::info {
|
||||
Result IsHblProcessId(bool *out, os::ProcessId process_id) {
|
||||
ncm::ProgramLocation loc;
|
||||
cfg::OverrideStatus override_status;
|
||||
R_TRY(GetProcessInfo(&loc, &override_status, process_id));
|
||||
R_TRY(GetProcessInfo(std::addressof(loc), std::addressof(override_status), process_id));
|
||||
|
||||
*out = override_status.IsHbl();
|
||||
return ResultSuccess();
|
||||
@@ -52,7 +52,7 @@ namespace ams::pm::info {
|
||||
|
||||
Result IsHblProgramId(bool *out, ncm::ProgramId program_id) {
|
||||
os::ProcessId process_id;
|
||||
R_TRY(GetProcessId(&process_id, program_id));
|
||||
R_TRY(GetProcessId(std::addressof(process_id), program_id));
|
||||
|
||||
return IsHblProcessId(out, process_id);
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ namespace ams::pm::info {
|
||||
/* Information API. */
|
||||
Result WEAK_SYMBOL HasLaunchedBootProgram(bool *out, ncm::ProgramId program_id) {
|
||||
bool has_launched = false;
|
||||
R_TRY(pminfoAtmosphereHasLaunchedBootProgram(&has_launched, static_cast<u64>(program_id)));
|
||||
R_TRY(pminfoAtmosphereHasLaunchedBootProgram(std::addressof(has_launched), static_cast<u64>(program_id)));
|
||||
*out = has_launched;
|
||||
return ResultSuccess();
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ 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 *>(&loc), reinterpret_cast<u64 *>(out));
|
||||
return pmshellLaunchProgram(launch_flags, reinterpret_cast<const NcmProgramLocation *>(std::addressof(loc)), reinterpret_cast<u64 *>(out));
|
||||
}
|
||||
|
||||
Result TerminateProcess(os::ProcessId process_id) {
|
||||
|
||||
Reference in New Issue
Block a user