mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-05-31 14:58:22 -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

30
libraries/libstratosphere/source/htcs/client/htcs_session.os.horizon.cpp
View file

@ -109,12 +109,12 @@ namespace ams::htcs::client {
Result RemoteManager::GetPeerNameAny(sf::Out<htcs::HtcsPeerName> out) {
static_assert(sizeof(htcs::HtcsPeerName) == sizeof(::HtcsPeerName));
return ::htcsGetPeerNameAny(reinterpret_cast<::HtcsPeerName *>(out.GetPointer()));
R_RETURN(::htcsGetPeerNameAny(reinterpret_cast<::HtcsPeerName *>(out.GetPointer())));
}
Result RemoteManager::GetDefaultHostName(sf::Out<htcs::HtcsPeerName> out) {
static_assert(sizeof(htcs::HtcsPeerName) == sizeof(::HtcsPeerName));
return ::htcsGetDefaultHostName(reinterpret_cast<::HtcsPeerName *>(out.GetPointer()));
R_RETURN(::htcsGetDefaultHostName(reinterpret_cast<::HtcsPeerName *>(out.GetPointer())));
}
Result RemoteManager::CreateSocket(sf::Out<s32> out_err, sf::Out<sf::SharedPointer<tma::ISocket>> out, bool enable_disconnection_emulation) {
@ -148,33 +148,33 @@ namespace ams::htcs::client {
}
Result RemoteManager::EndSelect(sf::Out<s32> out_err, sf::Out<s32> out_count, const sf::OutMapAliasArray<s32> &read_handles, const sf::OutMapAliasArray<s32> &write_handles, const sf::OutMapAliasArray<s32> &exception_handles, u32 task_id) {
return ::htcsEndSelect(out_err.GetPointer(), out_count.GetPointer(), read_handles.GetPointer(), read_handles.GetSize(), write_handles.GetPointer(), write_handles.GetSize(), exception_handles.GetPointer(), exception_handles.GetSize(), task_id);
R_RETURN(::htcsEndSelect(out_err.GetPointer(), out_count.GetPointer(), read_handles.GetPointer(), read_handles.GetSize(), write_handles.GetPointer(), write_handles.GetSize(), exception_handles.GetPointer(), exception_handles.GetSize(), task_id));
}
Result RemoteSocket::Close(sf::Out<s32> out_err, sf::Out<s32> out_res) {
return ::htcsSocketClose(std::addressof(m_s), out_err.GetPointer(), out_res.GetPointer());
R_RETURN(::htcsSocketClose(std::addressof(m_s), out_err.GetPointer(), out_res.GetPointer()));
}
Result RemoteSocket::Connect(sf::Out<s32> out_err, sf::Out<s32> out_res, const htcs::SockAddrHtcs &address) {
static_assert(sizeof(htcs::SockAddrHtcs) == sizeof(::HtcsSockAddr));
return ::htcsSocketConnect(std::addressof(m_s), out_err.GetPointer(), out_res.GetPointer(), reinterpret_cast<const ::HtcsSockAddr *>(std::addressof(address)));
R_RETURN(::htcsSocketConnect(std::addressof(m_s), out_err.GetPointer(), out_res.GetPointer(), reinterpret_cast<const ::HtcsSockAddr *>(std::addressof(address))));
}
Result RemoteSocket::Bind(sf::Out<s32> out_err, sf::Out<s32> out_res, const htcs::SockAddrHtcs &address) {
static_assert(sizeof(htcs::SockAddrHtcs) == sizeof(::HtcsSockAddr));
return ::htcsSocketBind(std::addressof(m_s), out_err.GetPointer(), out_res.GetPointer(), reinterpret_cast<const ::HtcsSockAddr *>(std::addressof(address)));
R_RETURN(::htcsSocketBind(std::addressof(m_s), out_err.GetPointer(), out_res.GetPointer(), reinterpret_cast<const ::HtcsSockAddr *>(std::addressof(address))));
}
Result RemoteSocket::Listen(sf::Out<s32> out_err, sf::Out<s32> out_res, s32 backlog_count) {
return ::htcsSocketListen(std::addressof(m_s), out_err.GetPointer(), out_res.GetPointer(), backlog_count);
R_RETURN(::htcsSocketListen(std::addressof(m_s), out_err.GetPointer(), out_res.GetPointer(), backlog_count));
}
Result RemoteSocket::Shutdown(sf::Out<s32> out_err, sf::Out<s32> out_res, s32 how) {
return ::htcsSocketShutdown(std::addressof(m_s), out_err.GetPointer(), out_res.GetPointer(), how);
R_RETURN(::htcsSocketShutdown(std::addressof(m_s), out_err.GetPointer(), out_res.GetPointer(), how));
}
Result RemoteSocket::Fcntl(sf::Out<s32> out_err, sf::Out<s32> out_res, s32 command, s32 value) {
return ::htcsSocketFcntl(std::addressof(m_s), out_err.GetPointer(), out_res.GetPointer(), command, value);
R_RETURN(::htcsSocketFcntl(std::addressof(m_s), out_err.GetPointer(), out_res.GetPointer(), command, value));
}
Result RemoteSocket::AcceptStart(sf::Out<u32> out_task_id, sf::OutCopyHandle out_event) {
@ -205,7 +205,7 @@ namespace ams::htcs::client {
}
Result RemoteSocket::RecvResults(sf::Out<s32> out_err, sf::Out<s64> out_size, const sf::OutAutoSelectBuffer &buffer, u32 task_id) {
return ::htcsSocketRecvResults(std::addressof(m_s), out_err.GetPointer(), out_size.GetPointer(), buffer.GetPointer(), buffer.GetSize(), task_id);
R_RETURN(::htcsSocketRecvResults(std::addressof(m_s), out_err.GetPointer(), out_size.GetPointer(), buffer.GetPointer(), buffer.GetSize(), task_id));
}
Result RemoteSocket::SendStart(sf::Out<u32> out_task_id, sf::OutCopyHandle out_event, const sf::InNonSecureAutoSelectBuffer &buffer, s32 flags) {
@ -217,7 +217,7 @@ namespace ams::htcs::client {
}
Result RemoteSocket::SendResults(sf::Out<s32> out_err, sf::Out<s64> out_size, u32 task_id) {
return ::htcsSocketSendResults(std::addressof(m_s), out_err.GetPointer(), out_size.GetPointer(), task_id);
R_RETURN(::htcsSocketSendResults(std::addressof(m_s), out_err.GetPointer(), out_size.GetPointer(), task_id));
}
Result RemoteSocket::StartSend(sf::Out<u32> out_task_id, sf::OutCopyHandle out_event, sf::Out<s64> out_max_size, s64 size, s32 flags) {
@ -229,11 +229,11 @@ namespace ams::htcs::client {
}
Result RemoteSocket::ContinueSend(sf::Out<s64> out_size, sf::Out<bool> out_wait, const sf::InNonSecureAutoSelectBuffer &buffer, u32 task_id) {
return ::htcsSocketContinueSend(std::addressof(m_s), out_size.GetPointer(), out_wait.GetPointer(), buffer.GetPointer(), buffer.GetSize(), task_id);
R_RETURN(::htcsSocketContinueSend(std::addressof(m_s), out_size.GetPointer(), out_wait.GetPointer(), buffer.GetPointer(), buffer.GetSize(), task_id));
}
Result RemoteSocket::EndSend(sf::Out<s32> out_err, sf::Out<s64> out_size, u32 task_id) {
return ::htcsSocketEndSend(std::addressof(m_s), out_err.GetPointer(), out_size.GetPointer(), task_id);
R_RETURN(::htcsSocketEndSend(std::addressof(m_s), out_err.GetPointer(), out_size.GetPointer(), task_id));
}
Result RemoteSocket::StartRecv(sf::Out<u32> out_task_id, sf::OutCopyHandle out_event, s64 size, s32 flags) {
@ -245,11 +245,11 @@ namespace ams::htcs::client {
}
Result RemoteSocket::EndRecv(sf::Out<s32> out_err, sf::Out<s64> out_size, const sf::OutAutoSelectBuffer &buffer, u32 task_id) {
return ::htcsSocketEndRecv(std::addressof(m_s), out_err.GetPointer(), out_size.GetPointer(), buffer.GetPointer(), buffer.GetSize(), task_id);
R_RETURN(::htcsSocketEndRecv(std::addressof(m_s), out_err.GetPointer(), out_size.GetPointer(), buffer.GetPointer(), buffer.GetSize(), task_id));
}
Result RemoteSocket::GetPrimitive(sf::Out<s32> out) {
return ::htcsSocketGetPrimitive(std::addressof(m_s), out.GetPointer());
R_RETURN(::htcsSocketGetPrimitive(std::addressof(m_s), out.GetPointer()));
}
}

12
libraries/libstratosphere/source/htcs/impl/htcs_manager.cpp
View file

@ -205,7 +205,7 @@ namespace ams::htcs::impl {
}
Result HtcsManager::AcceptStart(u32 *out_task_id, os::NativeHandle *out_handle, s32 desc) {
return m_impl->AcceptStart(out_task_id, out_handle, desc);
R_RETURN(m_impl->AcceptStart(out_task_id, out_handle, desc));
}
void HtcsManager::AcceptResults(s32 *out_err, s32 *out_desc, SockAddrHtcs *out_address, u32 task_id, s32 desc) {
@ -228,7 +228,7 @@ namespace ams::htcs::impl {
}
Result HtcsManager::RecvStart(u32 *out_task_id, os::NativeHandle *out_handle, s64 size, s32 desc, s32 flags) {
return m_impl->RecvStart(out_task_id, out_handle, size, desc, flags);
R_RETURN(m_impl->RecvStart(out_task_id, out_handle, size, desc, flags));
}
void HtcsManager::RecvResults(s32 *out_err, s64 *out_size, char *buffer, s64 buffer_size, u32 task_id, s32 desc) {
@ -256,11 +256,11 @@ namespace ams::htcs::impl {
}
Result HtcsManager::SendStart(u32 *out_task_id, os::NativeHandle *out_handle, const char *buffer, s64 size, s32 desc, s32 flags) {
return m_impl->SendStart(out_task_id, out_handle, buffer, size, desc, flags);
R_RETURN(m_impl->SendStart(out_task_id, out_handle, buffer, size, desc, flags));
}
Result HtcsManager::SendLargeStart(u32 *out_task_id, os::NativeHandle *out_handle, const char **buffers, const s64 *sizes, s32 count, s32 desc, s32 flags) {
return m_impl->SendLargeStart(out_task_id, out_handle, buffers, sizes, count, desc, flags);
R_RETURN(m_impl->SendLargeStart(out_task_id, out_handle, buffers, sizes, count, desc, flags));
}
void HtcsManager::SendResults(s32 *out_err, s64 *out_size, u32 task_id, s32 desc) {
@ -288,7 +288,7 @@ namespace ams::htcs::impl {
}
Result HtcsManager::StartSend(u32 *out_task_id, os::NativeHandle *out_handle, s32 desc, s64 size, s32 flags) {
return m_impl->StartSend(out_task_id, out_handle, desc, size, flags);
R_RETURN(m_impl->StartSend(out_task_id, out_handle, desc, size, flags));
}
Result HtcsManager::ContinueSend(s64 *out_size, const char *buffer, s64 buffer_size, u32 task_id, s32 desc) {
@ -329,7 +329,7 @@ namespace ams::htcs::impl {
}
Result HtcsManager::StartRecv(u32 *out_task_id, os::NativeHandle *out_handle, s64 size, s32 desc, s32 flags) {
return m_impl->StartRecv(out_task_id, out_handle, size, desc, flags);
R_RETURN(m_impl->StartRecv(out_task_id, out_handle, size, desc, flags));
}
void HtcsManager::EndRecv(s32 *out_err, s64 *out_size, char *buffer, s64 buffer_size, u32 task_id, s32 desc) {

48
libraries/libstratosphere/source/htcs/impl/htcs_manager_impl.cpp
View file

@ -47,55 +47,55 @@ namespace ams::htcs::impl {
}
Result HtcsManagerImpl::CreateSocket(s32 *out_err, s32 *out_desc, bool enable_disconnection_emulation) {
return m_service.CreateSocket(out_err, out_desc, enable_disconnection_emulation);
R_RETURN(m_service.CreateSocket(out_err, out_desc, enable_disconnection_emulation));
}
Result HtcsManagerImpl::DestroySocket(s32 desc) {
return m_service.DestroySocket(desc);
R_RETURN(m_service.DestroySocket(desc));
}
Result HtcsManagerImpl::Connect(s32 *out_err, s32 desc, const SockAddrHtcs &address) {
return m_service.Connect(out_err, desc, address);
R_RETURN(m_service.Connect(out_err, desc, address));
}
Result HtcsManagerImpl::Bind(s32 *out_err, s32 desc, const SockAddrHtcs &address) {
return m_service.Bind(out_err, desc, address);
R_RETURN(m_service.Bind(out_err, desc, address));
}
Result HtcsManagerImpl::Listen(s32 *out_err, s32 desc, s32 backlog_count) {
return m_service.Listen(out_err, desc, backlog_count);
R_RETURN(m_service.Listen(out_err, desc, backlog_count));
}
Result HtcsManagerImpl::Receive(s32 *out_err, s64 *out_size, char *buffer, size_t size, s32 desc, s32 flags) {
return m_service.Receive(out_err, out_size, buffer, size, desc, flags);
R_RETURN(m_service.Receive(out_err, out_size, buffer, size, desc, flags));
}
Result HtcsManagerImpl::Send(s32 *out_err, s64 *out_size, const char *buffer, size_t size, s32 desc, s32 flags) {
return m_service.Send(out_err, out_size, buffer, size, desc, flags);
R_RETURN(m_service.Send(out_err, out_size, buffer, size, desc, flags));
}
Result HtcsManagerImpl::Shutdown(s32 *out_err, s32 desc, s32 how) {
return m_service.Shutdown(out_err, desc, how);
R_RETURN(m_service.Shutdown(out_err, desc, how));
}
Result HtcsManagerImpl::Fcntl(s32 *out_err, s32 *out_res, s32 desc, s32 command, s32 value) {
return m_service.Fcntl(out_err, out_res, desc, command, value);
R_RETURN(m_service.Fcntl(out_err, out_res, desc, command, value));
}
Result HtcsManagerImpl::AcceptStart(u32 *out_task_id, os::NativeHandle *out_handle, s32 desc) {
return m_service.AcceptStart(out_task_id, out_handle, desc);
R_RETURN(m_service.AcceptStart(out_task_id, out_handle, desc));
}
Result HtcsManagerImpl::AcceptResults(s32 *out_err, s32 *out_desc, SockAddrHtcs *out_address, u32 task_id, s32 desc) {
return m_service.AcceptResults(out_err, out_desc, out_address, task_id, desc);
R_RETURN(m_service.AcceptResults(out_err, out_desc, out_address, task_id, desc));
}
Result HtcsManagerImpl::RecvStart(u32 *out_task_id, os::NativeHandle *out_handle, s64 size, s32 desc, s32 flags) {
return m_service.ReceiveSmallStart(out_task_id, out_handle, size, desc, flags);
R_RETURN(m_service.ReceiveSmallStart(out_task_id, out_handle, size, desc, flags));
}
Result HtcsManagerImpl::RecvResults(s32 *out_err, s64 *out_size, char *buffer, s64 buffer_size, u32 task_id, s32 desc) {
return m_service.ReceiveSmallResults(out_err, out_size, buffer, buffer_size, task_id, desc);
R_RETURN(m_service.ReceiveSmallResults(out_err, out_size, buffer, buffer_size, task_id, desc));
}
Result HtcsManagerImpl::SendStart(u32 *out_task_id, os::NativeHandle *out_handle, const char *buffer, s64 size, s32 desc, s32 flags) {
@ -110,6 +110,8 @@ namespace ams::htcs::impl {
if (R_SUCCEEDED(result) || htcs::ResultCompleted::Includes(result) || htc::ResultTaskQueueNotAvailable::Includes(result)) {
*out_task_id = task_id;
*out_handle = handle;
R_SUCCEED();
} else {
os::SystemEventType event;
os::AttachReadableHandleToSystemEvent(std::addressof(event), handle, true, os::EventClearMode_ManualClear);
@ -120,10 +122,8 @@ namespace ams::htcs::impl {
os::DestroySystemEvent(std::addressof(event));
return result;
R_RETURN(result);
}
R_SUCCEED();
}
Result HtcsManagerImpl::SendLargeStart(u32 *out_task_id, os::NativeHandle *out_handle, const char **buffers, const s64 *sizes, s32 count, s32 desc, s32 flags) {
@ -133,27 +133,27 @@ namespace ams::htcs::impl {
}
Result HtcsManagerImpl::SendResults(s32 *out_err, s64 *out_size, u32 task_id, s32 desc) {
return m_service.SendSmallResults(out_err, out_size, task_id, desc);
R_RETURN(m_service.SendSmallResults(out_err, out_size, task_id, desc));
}
Result HtcsManagerImpl::StartSend(u32 *out_task_id, os::NativeHandle *out_handle, s32 desc, s64 size, s32 flags) {
return m_service.SendStart(out_task_id, out_handle, desc, size, flags);
R_RETURN(m_service.SendStart(out_task_id, out_handle, desc, size, flags));
}
Result HtcsManagerImpl::ContinueSend(s64 *out_size, const char *buffer, s64 buffer_size, u32 task_id, s32 desc) {
return m_service.SendContinue(out_size, buffer, buffer_size, task_id, desc);
R_RETURN(m_service.SendContinue(out_size, buffer, buffer_size, task_id, desc));
}
Result HtcsManagerImpl::EndSend(s32 *out_err, s64 *out_size, u32 task_id, s32 desc) {
return m_service.SendResults(out_err, out_size, task_id, desc);
R_RETURN(m_service.SendResults(out_err, out_size, task_id, desc));
}
Result HtcsManagerImpl::StartRecv(u32 *out_task_id, os::NativeHandle *out_handle, s64 size, s32 desc, s32 flags) {
return m_service.ReceiveStart(out_task_id, out_handle, size, desc, flags);
R_RETURN(m_service.ReceiveStart(out_task_id, out_handle, size, desc, flags));
}
Result HtcsManagerImpl::EndRecv(s32 *out_err, s64 *out_size, char *buffer, s64 buffer_size, u32 task_id, s32 desc) {
return m_service.ReceiveResults(out_err, out_size, buffer, buffer_size, task_id, desc);
R_RETURN(m_service.ReceiveResults(out_err, out_size, buffer, buffer_size, task_id, desc));
}
Result HtcsManagerImpl::StartSelect(u32 *out_task_id, os::NativeHandle *out_handle, Span<const int> read_handles, Span<const int> write_handles, Span<const int> exception_handles, s64 tv_sec, s64 tv_usec) {
@ -179,11 +179,11 @@ namespace ams::htcs::impl {
*out_handle = handle;
}
return result;
R_RETURN(result);
}
Result HtcsManagerImpl::EndSelect(s32 *out_err, bool *out_empty, Span<int> read_handles, Span<int> write_handles, Span<int> exception_handles, u32 task_id) {
return m_service.SelectEnd(out_err, out_empty, read_handles, write_handles, exception_handles, task_id);
R_RETURN(m_service.SelectEnd(out_err, out_empty, read_handles, write_handles, exception_handles, task_id));
}
}

2
libraries/libstratosphere/source/htcs/impl/htcs_service.cpp
View file

@ -148,7 +148,7 @@ namespace ams::htcs::impl {
s64 cont_size;
const Result result = this->SendContinue(std::addressof(cont_size), buffer, size, task_id, desc);
if (R_FAILED(result)) {
return this->SendResults(out_err, out_size, task_id, desc);
R_RETURN(this->SendResults(out_err, out_size, task_id, desc));
}
/* Wait for the task to complete. */

4
libraries/libstratosphere/source/htcs/server/htcs_manager_service_object.cpp
View file

@ -44,7 +44,7 @@ namespace ams::htcs::server {
}
Result ManagerServiceObject::CreateSocketOld(sf::Out<s32> out_err, sf::Out<sf::SharedPointer<tma::ISocket>> out) {
return this->CreateSocket(out_err, out, false);
R_RETURN(this->CreateSocket(out_err, out, false));
}
Result ManagerServiceObject::CreateSocket(sf::Out<s32> out_err, sf::Out<sf::SharedPointer<tma::ISocket>> out, bool enable_disconnection_emulation) {
@ -94,7 +94,7 @@ namespace ams::htcs::server {
auto *manager = impl::HtcsManagerHolder::GetHtcsManager();
/* End the select. */
return manager->EndSelect(out_err.GetPointer(), out_count.GetPointer(), read_handles.ToSpan(), write_handles.ToSpan(), exception_handles.ToSpan(), task_id);
R_RETURN(manager->EndSelect(out_err.GetPointer(), out_count.GetPointer(), read_handles.ToSpan(), write_handles.ToSpan(), exception_handles.ToSpan(), task_id));
}
}

4
libraries/libstratosphere/source/htcs/server/htcs_socket_service_object.cpp
View file

@ -194,7 +194,7 @@ namespace ams::htcs::server {
}
Result SocketServiceObject::SendStartOld(sf::Out<u32> out_task_id, sf::OutCopyHandle out_event, const sf::InAutoSelectBuffer &buffer, s32 flags) {
return this->SendStart(out_task_id, out_event, sf::InNonSecureAutoSelectBuffer(buffer.GetPointer(), buffer.GetSize()), flags);
R_RETURN(this->SendStart(out_task_id, out_event, sf::InNonSecureAutoSelectBuffer(buffer.GetPointer(), buffer.GetSize()), flags));
}
Result SocketServiceObject::SendLargeStart(sf::Out<u32> out_task_id, sf::OutCopyHandle out_event, const sf::InAutoSelectBuffer &start_buffer, const sf::InAutoSelectBuffer &end_buffer, sf::CopyHandle &&mem_handle, s64 aligned_size, s32 flags) {
@ -257,7 +257,7 @@ namespace ams::htcs::server {
}
Result SocketServiceObject::ContinueSendOld(sf::Out<s64> out_size, sf::Out<bool> out_wait, const sf::InAutoSelectBuffer &buffer, u32 task_id) {
return this->ContinueSend(out_size, out_wait, sf::InNonSecureAutoSelectBuffer(buffer.GetPointer(), buffer.GetSize()), task_id);
R_RETURN(this->ContinueSend(out_size, out_wait, sf::InNonSecureAutoSelectBuffer(buffer.GetPointer(), buffer.GetSize()), task_id));
}
Result SocketServiceObject::EndSend(sf::Out<s32> out_err, sf::Out<s64> out_size, u32 task_id) {