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

10
libraries/libstratosphere/source/time/time_api.cpp
View File

@@ -73,18 +73,18 @@ namespace ams::time {
}
Result Initialize() {
return InitializeImpl(InitializeMode_Normal);
R_RETURN(InitializeImpl(InitializeMode_Normal));
}
Result InitializeForSystem() {
return InitializeImpl(InitializeMode_System);
R_RETURN(InitializeImpl(InitializeMode_System));
}
Result InitializeForSystemUser() {
if (hos::GetVersion() >= hos::Version_9_0_0) {
return InitializeImpl(InitializeMode_SystemUser);
R_RETURN(InitializeImpl(InitializeMode_SystemUser));
} else {
return InitializeImpl(InitializeMode_Normal);
R_RETURN(InitializeImpl(InitializeMode_Normal));
}
}
@@ -116,7 +116,7 @@ namespace ams::time {
}
Result GetElapsedSecondsBetween(s64 *out, const SteadyClockTimePoint &from, const SteadyClockTimePoint &to) {
return impl::util::GetSpanBetween(out, from, to);
R_RETURN(impl::util::GetSpanBetween(out, from, to));
}
}

2
libraries/libstratosphere/source/time/time_standard_network_system_clock.cpp
View File

@@ -20,7 +20,7 @@ namespace ams::time {
Result StandardNetworkSystemClock::GetCurrentTime(PosixTime *out) {
#if defined(ATMOSPHERE_OS_HORIZON)
static_assert(sizeof(*out) == sizeof(u64));
return ::timeGetCurrentTime(::TimeType_NetworkSystemClock, reinterpret_cast<u64 *>(out));
R_RETURN(::timeGetCurrentTime(::TimeType_NetworkSystemClock, reinterpret_cast<u64 *>(out)));
#else
AMS_UNUSED(out);
AMS_ABORT("TODO");

4
libraries/libstratosphere/source/time/time_standard_steady_clock.cpp
View File

@@ -20,7 +20,7 @@ namespace ams::time {
Result GetStandardSteadyClockCurrentTimePoint(SteadyClockTimePoint *out) {
#if defined(ATMOSPHERE_OS_HORIZON)
static_assert(sizeof(*out) == sizeof(::TimeSteadyClockTimePoint));
return ::timeGetStandardSteadyClockTimePoint(reinterpret_cast<::TimeSteadyClockTimePoint *>(out));
R_RETURN(::timeGetStandardSteadyClockTimePoint(reinterpret_cast<::TimeSteadyClockTimePoint *>(out)));
#else
AMS_UNUSED(out);
AMS_ABORT("TODO");
@@ -42,7 +42,7 @@ namespace ams::time {
}
Result StandardSteadyClock::GetCurrentTimePoint(SteadyClockTimePoint *out) {
return GetStandardSteadyClockCurrentTimePoint(out);
R_RETURN(GetStandardSteadyClockCurrentTimePoint(out));
}
StandardSteadyClock::time_point StandardSteadyClock::now() {

2
libraries/libstratosphere/source/time/time_standard_user_system_clock.cpp
View File

@@ -20,7 +20,7 @@ namespace ams::time {
Result StandardUserSystemClock::GetCurrentTime(PosixTime *out) {
#if defined(ATMOSPHERE_OS_HORIZON)
static_assert(sizeof(*out) == sizeof(u64));
return ::timeGetCurrentTime(::TimeType_UserSystemClock, reinterpret_cast<u64 *>(out));
R_RETURN(::timeGetCurrentTime(::TimeType_UserSystemClock, reinterpret_cast<u64 *>(out)));
#else
AMS_UNUSED(out);
AMS_ABORT("TODO");