mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-11-29 23:32:23 +00:00
Code Issues Releases Activity

libstrat: fix unconverted _WITH_ASSERTs

Browse source
This commit is contained in:
Michael Scire 2020-02-24 05:01:41 -08:00
parent 8ccac1d18a
commit 80e1847534
7 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/libstratosphere/include/stratosphere/os/os_condvar.hpp
View file

@ -39,7 +39,7 @@ namespace ams::os {
/* Abort on any error other than timed out/success. */ /* Abort on any error other than timed out/success. */
R_TRY_CATCH(condvarWaitTimeout(&this->cv, m, timeout)) { R_TRY_CATCH(condvarWaitTimeout(&this->cv, m, timeout)) {
R_CATCH(svc::ResultTimedOut) { return ConditionVariableStatus::TimedOut; } R_CATCH(svc::ResultTimedOut) { return ConditionVariableStatus::TimedOut; }
} R_END_TRY_CATCH_WITH_ASSERT; } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
return ConditionVariableStatus::Success; return ConditionVariableStatus::Success;
} }

2
libraries/libstratosphere/source/dd/dd_io_mappings.cpp
View file

@ -25,7 +25,7 @@ namespace ams::dd {
R_TRY_CATCH(svcQueryIoMapping(&virtual_addr, aligned_addr, aligned_size)) { R_TRY_CATCH(svcQueryIoMapping(&virtual_addr, aligned_addr, aligned_size)) {
/* Official software handles this by returning 0. */ /* Official software handles this by returning 0. */
R_CATCH(svc::ResultNotFound) { return 0; } R_CATCH(svc::ResultNotFound) { return 0; }
} R_END_TRY_CATCH_WITH_ASSERT; } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
return static_cast<uintptr_t>(virtual_addr + offset); return static_cast<uintptr_t>(virtual_addr + offset);
} }

12
libraries/libstratosphere/source/os/impl/os_inter_process_event.cpp
View file

@ -23,7 +23,7 @@ namespace ams::os::impl {
/* Create the event handles. */ /* Create the event handles. */
R_TRY_CATCH(svcCreateEvent(out_writable, out_readable)) { R_TRY_CATCH(svcCreateEvent(out_writable, out_readable)) {
R_CONVERT(svc::ResultOutOfResource, ResultOutOfResource()); R_CONVERT(svc::ResultOutOfResource, ResultOutOfResource());
} R_END_TRY_CATCH_WITH_ASSERT; } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
return ResultSuccess(); return ResultSuccess();
} }
@ -120,14 +120,14 @@ namespace ams::os::impl {
/* Continuously wait, until success. */ /* Continuously wait, until success. */
R_TRY_CATCH(svcWaitSynchronizationSingle(handle, U64_MAX)) { R_TRY_CATCH(svcWaitSynchronizationSingle(handle, U64_MAX)) {
R_CATCH(svc::ResultCancelled) { continue; } R_CATCH(svc::ResultCancelled) { continue; }
} R_END_TRY_CATCH_WITH_ASSERT; } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
/* Clear, if we must. */ /* Clear, if we must. */
if (this->auto_clear) { if (this->auto_clear) {
R_TRY_CATCH(svcResetSignal(handle)) { R_TRY_CATCH(svcResetSignal(handle)) {
/* Some other thread might have caught this before we did. */ /* Some other thread might have caught this before we did. */
R_CATCH(svc::ResultInvalidState) { continue; } R_CATCH(svc::ResultInvalidState) { continue; }
} R_END_TRY_CATCH_WITH_ASSERT; } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
} }
return; return;
} }
@ -146,7 +146,7 @@ namespace ams::os::impl {
R_TRY_CATCH(svcWaitSynchronizationSingle(handle, 0)) { R_TRY_CATCH(svcWaitSynchronizationSingle(handle, 0)) {
R_CATCH(svc::ResultTimedOut) { return false; } R_CATCH(svc::ResultTimedOut) { return false; }
R_CATCH(svc::ResultCancelled) { continue; } R_CATCH(svc::ResultCancelled) { continue; }
} R_END_TRY_CATCH_WITH_ASSERT; } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
/* We succeeded, so we're signaled. */ /* We succeeded, so we're signaled. */
return true; return true;
@ -163,14 +163,14 @@ namespace ams::os::impl {
R_TRY_CATCH(svcWaitSynchronizationSingle(handle, timeout_helper.NsUntilTimeout())) { R_TRY_CATCH(svcWaitSynchronizationSingle(handle, timeout_helper.NsUntilTimeout())) {
R_CATCH(svc::ResultTimedOut) { return false; } R_CATCH(svc::ResultTimedOut) { return false; }
R_CATCH(svc::ResultCancelled) { continue; } R_CATCH(svc::ResultCancelled) { continue; }
} R_END_TRY_CATCH_WITH_ASSERT; } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
/* Clear, if we must. */ /* Clear, if we must. */
if (this->auto_clear) { if (this->auto_clear) {
R_TRY_CATCH(svcResetSignal(handle)) { R_TRY_CATCH(svcResetSignal(handle)) {
/* Some other thread might have caught this before we did. */ /* Some other thread might have caught this before we did. */
R_CATCH(svc::ResultInvalidState) { continue; } R_CATCH(svc::ResultInvalidState) { continue; }
} R_END_TRY_CATCH_WITH_ASSERT; } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
} }
return true; return true;

2
libraries/libstratosphere/source/os/impl/os_waitable_manager_impl.cpp
View file

@ -105,7 +105,7 @@ namespace ams::os::impl{
/* svc::ResultInvalidHandle. */ /* svc::ResultInvalidHandle. */
/* svc::ResultInvalidPointer */ /* svc::ResultInvalidPointer */
/* svc::ResultOutOfRange */ /* svc::ResultOutOfRange */
} R_END_TRY_CATCH_WITH_ASSERT; } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
return index; return index;
} }

10
libraries/libstratosphere/source/os/os_interrupt_event.cpp
View file

@ -51,14 +51,14 @@ namespace ams::os {
/* Continuously wait, until success. */ /* Continuously wait, until success. */
R_TRY_CATCH(svcWaitSynchronizationSingle(this->handle.Get(), U64_MAX)) { R_TRY_CATCH(svcWaitSynchronizationSingle(this->handle.Get(), U64_MAX)) {
R_CATCH(svc::ResultCancelled) { continue; } R_CATCH(svc::ResultCancelled) { continue; }
} R_END_TRY_CATCH_WITH_ASSERT; } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
/* Clear, if we must. */ /* Clear, if we must. */
if (this->auto_clear) { if (this->auto_clear) {
R_TRY_CATCH(svcResetSignal(this->handle.Get())) { R_TRY_CATCH(svcResetSignal(this->handle.Get())) {
/* Some other thread might have caught this before we did. */ /* Some other thread might have caught this before we did. */
R_CATCH(svc::ResultInvalidState) { continue; } R_CATCH(svc::ResultInvalidState) { continue; }
} R_END_TRY_CATCH_WITH_ASSERT; } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
} }
return; return;
} }
@ -77,7 +77,7 @@ namespace ams::os {
R_TRY_CATCH(svcWaitSynchronizationSingle(this->handle.Get(), 0)) { R_TRY_CATCH(svcWaitSynchronizationSingle(this->handle.Get(), 0)) {
R_CATCH(svc::ResultTimedOut) { return false; } R_CATCH(svc::ResultTimedOut) { return false; }
R_CATCH(svc::ResultCancelled) { continue; } R_CATCH(svc::ResultCancelled) { continue; }
} R_END_TRY_CATCH_WITH_ASSERT; } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
/* We succeeded, so we're signaled. */ /* We succeeded, so we're signaled. */
return true; return true;
@ -94,14 +94,14 @@ namespace ams::os {
R_TRY_CATCH(svcWaitSynchronizationSingle(this->handle.Get(), timeout_helper.NsUntilTimeout())) { R_TRY_CATCH(svcWaitSynchronizationSingle(this->handle.Get(), timeout_helper.NsUntilTimeout())) {
R_CATCH(svc::ResultTimedOut) { return false; } R_CATCH(svc::ResultTimedOut) { return false; }
R_CATCH(svc::ResultCancelled) { continue; } R_CATCH(svc::ResultCancelled) { continue; }
} R_END_TRY_CATCH_WITH_ASSERT; } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
/* Clear, if we must. */ /* Clear, if we must. */
if (this->auto_clear) { if (this->auto_clear) {
R_TRY_CATCH(svcResetSignal(this->handle.Get())) { R_TRY_CATCH(svcResetSignal(this->handle.Get())) {
/* Some other thread might have caught this before we did. */ /* Some other thread might have caught this before we did. */
R_CATCH(svc::ResultInvalidState) { continue; } R_CATCH(svc::ResultInvalidState) { continue; }
} R_END_TRY_CATCH_WITH_ASSERT; } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
} }
return true; return true;

2
libraries/libstratosphere/source/sf/hipc/sf_hipc_server_manager.cpp
View file

@ -167,7 +167,7 @@ namespace ams::sf::hipc {
needs_undefer_all = true; needs_undefer_all = true;
continue; continue;
} }
} R_END_TRY_CATCH_WITH_ASSERT; } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
/* We succeeded! Remove from deferred list. */ /* We succeeded! Remove from deferred list. */
it = this->deferred_session_list.erase(it); it = this->deferred_session_list.erase(it);

2
stratosphere/boot/source/i2c/driver/impl/i2c_bus_accessor.cpp
View file

@ -413,7 +413,7 @@ namespace ams::i2c::driver::impl {
this->SetPacketMode(); this->SetPacketMode();
this->FlushFifos(); this->FlushFifos();
} }
} R_END_TRY_CATCH_WITH_ASSERT; } R_END_TRY_CATCH_WITH_ABORT_UNLESS;
} }
Result BusAccessor::GetAndHandleTransactionResult() { Result BusAccessor::GetAndHandleTransactionResult() {