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: use R_SUCCEED, R_THROW globally

Browse source
This commit is contained in:
Michael Scire 2022-03-26 00:14:36 -07:00
parent e5b1739f65
commit dd78ede99f
370 changed files with 2107 additions and 2107 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -124,19 +124,19 @@ namespace ams::htcs::client {
R_SUCCEED_IF(*out_err != 0);
*out = ObjectFactory::CreateSharedEmplaced<tma::ISocket, RemoteSocket>(libnx_socket);
return ResultSuccess();
R_SUCCEED();
}
Result RemoteManager::RegisterProcessId(const sf::ClientProcessId &client_pid) {
/* Handled by libnx init. */
AMS_UNUSED(client_pid);
return ResultSuccess();
R_SUCCEED();
}
Result RemoteManager::MonitorManager(const sf::ClientProcessId &client_pid) {
/* Handled by libnx init. */
AMS_UNUSED(client_pid);
return ResultSuccess();
R_SUCCEED();
}
Result RemoteManager::StartSelect(sf::Out<u32> out_task_id, sf::OutCopyHandle out_event, const sf::InMapAliasArray<s32> &read_handles, const sf::InMapAliasArray<s32> &write_handles, const sf::InMapAliasArray<s32> &exception_handles, s64 tv_sec, s64 tv_usec) {
@ -144,7 +144,7 @@ namespace ams::htcs::client {
R_TRY(::htcsStartSelect(out_task_id.GetPointer(), std::addressof(event_handle), read_handles.GetPointer(), read_handles.GetSize(), write_handles.GetPointer(), write_handles.GetSize(), exception_handles.GetPointer(), exception_handles.GetSize(), tv_sec, tv_usec));
out_event.SetValue(event_handle, true);
return ResultSuccess();
R_SUCCEED();
}
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) {
@ -182,7 +182,7 @@ namespace ams::htcs::client {
R_TRY(::htcsSocketAcceptStart(std::addressof(m_s), out_task_id.GetPointer(), std::addressof(event_handle)));
out_event.SetValue(event_handle, true);
return ResultSuccess();
R_SUCCEED();
}
Result RemoteSocket::AcceptResults(sf::Out<s32> out_err, sf::Out<sf::SharedPointer<tma::ISocket>> out, sf::Out<htcs::SockAddrHtcs> out_address, u32 task_id) {
@ -193,7 +193,7 @@ namespace ams::htcs::client {
R_SUCCEED_IF(*out_err != 0);
*out = ObjectFactory::CreateSharedEmplaced<tma::ISocket, RemoteSocket>(libnx_socket);
return ResultSuccess();
R_SUCCEED();
}
Result RemoteSocket::RecvStart(sf::Out<u32> out_task_id, sf::OutCopyHandle out_event, s32 mem_size, s32 flags) {
@ -201,7 +201,7 @@ namespace ams::htcs::client {
R_TRY(::htcsSocketRecvStart(std::addressof(m_s), out_task_id.GetPointer(), std::addressof(event_handle), mem_size, flags));
out_event.SetValue(event_handle, true);
return ResultSuccess();
R_SUCCEED();
}
Result RemoteSocket::RecvResults(sf::Out<s32> out_err, sf::Out<s64> out_size, const sf::OutAutoSelectBuffer &buffer, u32 task_id) {
@ -213,7 +213,7 @@ namespace ams::htcs::client {
R_TRY(::htcsSocketSendStart(std::addressof(m_s), out_task_id.GetPointer(), std::addressof(event_handle), buffer.GetPointer(), buffer.GetSize(), flags));
out_event.SetValue(event_handle, true);
return ResultSuccess();
R_SUCCEED();
}
Result RemoteSocket::SendResults(sf::Out<s32> out_err, sf::Out<s64> out_size, u32 task_id) {
@ -225,7 +225,7 @@ namespace ams::htcs::client {
R_TRY(::htcsSocketStartSend(std::addressof(m_s), out_task_id.GetPointer(), std::addressof(event_handle), out_max_size.GetPointer(), size, flags));
out_event.SetValue(event_handle, true);
return ResultSuccess();
R_SUCCEED();
}
Result RemoteSocket::ContinueSend(sf::Out<s64> out_size, sf::Out<bool> out_wait, const sf::InNonSecureAutoSelectBuffer &buffer, u32 task_id) {
@ -241,7 +241,7 @@ namespace ams::htcs::client {
R_TRY(::htcsSocketStartRecv(std::addressof(m_s), out_task_id.GetPointer(), std::addressof(event_handle), size, flags));
out_event.SetValue(event_handle, true);
return ResultSuccess();
R_SUCCEED();
}
Result RemoteSocket::EndRecv(sf::Out<s32> out_err, sf::Out<s64> out_size, const sf::OutAutoSelectBuffer &buffer, u32 task_id) {

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

@ -301,7 +301,7 @@ namespace ams::htcs::impl {
/* Set output. */
*out_size = size;
return ResultSuccess();
R_SUCCEED();
}
void HtcsManager::EndSend(s32 *out_err, s64 *out_size, u32 task_id, s32 desc) {
@ -362,7 +362,7 @@ namespace ams::htcs::impl {
R_CONVERT(htc::ResultTaskCancelled, tma::ResultUnknown())
} R_END_TRY_CATCH;
return ResultSuccess();
R_SUCCEED();
}
Result HtcsManager::EndSelect(s32 *out_err, s32 *out_count, Span<int> read_handles, Span<int> write_handles, Span<int> exception_handles, u32 task_id) {
@ -392,7 +392,7 @@ namespace ams::htcs::impl {
}
}
return ResultSuccess();
R_SUCCEED();
}
}

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

@ -123,7 +123,7 @@ namespace ams::htcs::impl {
return result;
}
return ResultSuccess();
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) {

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

@ -43,7 +43,7 @@ namespace ams::htcs::impl {
/* Set output. */
*out_err = err;
*out_desc = desc;
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::DestroySocket(s32 desc) {
@ -61,7 +61,7 @@ namespace ams::htcs::impl {
htcs::SocketError err;
R_TRY(m_rpc_client->End<rpc::CloseTask>(task_id, std::addressof(err)));
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::Connect(s32 *out_err, s32 desc, const SockAddrHtcs &address) {
@ -83,7 +83,7 @@ namespace ams::htcs::impl {
/* Set output. */
*out_err = err;
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::Bind(s32 *out_err, s32 desc, const SockAddrHtcs &address) {
@ -105,7 +105,7 @@ namespace ams::htcs::impl {
/* Set output. */
*out_err = err;
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::Listen(s32 *out_err, s32 desc, s32 backlog_count) {
@ -122,7 +122,7 @@ namespace ams::htcs::impl {
/* Set output. */
*out_err = err;
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::Receive(s32 *out_err, s64 *out_size, char *buffer, s64 size, s32 desc, s32 flags) {
@ -136,7 +136,7 @@ namespace ams::htcs::impl {
/* Finish the task. */
R_TRY(this->ReceiveResults(out_err, out_size, buffer, size, task_id, desc));
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::Send(s32 *out_err, s64 *out_size, const char *buffer, s64 size, s32 desc, s32 flags) {
@ -157,7 +157,7 @@ namespace ams::htcs::impl {
/* Finish the task. */
R_TRY(this->SendResults(out_err, out_size, task_id, desc));
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::Shutdown(s32 *out_err, s32 desc, s32 how) {
@ -174,7 +174,7 @@ namespace ams::htcs::impl {
/* Set output. */
*out_err = err;
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::Fcntl(s32 *out_err, s32 *out_res, s32 desc, s32 command, s32 value) {
@ -193,7 +193,7 @@ namespace ams::htcs::impl {
/* Set output. */
*out_err = err;
*out_res = res;
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::AcceptStart(u32 *out_task_id, os::NativeHandle *out_handle, s32 desc) {
@ -205,7 +205,7 @@ namespace ams::htcs::impl {
*out_task_id = task_id;
*out_handle = m_rpc_client->DetachReadableHandle(task_id);
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::AcceptResults(s32 *out_err, s32 *out_desc, SockAddrHtcs *out_address, u32 task_id, s32 desc) {
@ -219,7 +219,7 @@ namespace ams::htcs::impl {
/* Set output. */
*out_err = err;
*out_desc = ret_desc;
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::ReceiveSmallStart(u32 *out_task_id, os::NativeHandle *out_handle, s64 size, s32 desc, s32 flags) {
@ -231,7 +231,7 @@ namespace ams::htcs::impl {
*out_task_id = task_id;
*out_handle = m_rpc_client->DetachReadableHandle(task_id);
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::ReceiveSmallResults(s32 *out_err, s64 *out_size, char *buffer, s64 buffer_size, u32 task_id, s32 desc) {
@ -246,7 +246,7 @@ namespace ams::htcs::impl {
/* Set output. */
*out_err = err;
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::SendSmallStart(u32 *out_task_id, os::NativeHandle *out_handle, s32 desc, s64 size, s32 flags) {
@ -258,7 +258,7 @@ namespace ams::htcs::impl {
*out_task_id = task_id;
*out_handle = m_rpc_client->DetachReadableHandle(task_id);
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::SendSmallContinue(s64 *out_size, const char *buffer, s64 buffer_size, u32 task_id, s32 desc) {
@ -270,7 +270,7 @@ namespace ams::htcs::impl {
/* Set output. */
*out_size = buffer_size;
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::SendSmallResults(s32 *out_err, s64 *out_size, u32 task_id, s32 desc) {
@ -282,7 +282,7 @@ namespace ams::htcs::impl {
/* Set output. */
*out_err = err;
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::SendStart(u32 *out_task_id, os::NativeHandle *out_handle, s32 desc, s64 size, s32 flags) {
@ -294,7 +294,7 @@ namespace ams::htcs::impl {
*out_task_id = task_id;
*out_handle = m_rpc_client->DetachReadableHandle(task_id);
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::SendContinue(s64 *out_size, const char *buffer, s64 buffer_size, u32 task_id, s32 desc) {
@ -315,7 +315,7 @@ namespace ams::htcs::impl {
/* Set output. */
*out_size = buffer_size;
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::SendResults(s32 *out_err, s64 *out_size, u32 task_id, s32 desc) {
@ -328,7 +328,7 @@ namespace ams::htcs::impl {
/* Set output. */
*out_err = err;
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::ReceiveStart(u32 *out_task_id, os::NativeHandle *out_handle, s64 size, s32 desc, s32 flags) {
@ -340,7 +340,7 @@ namespace ams::htcs::impl {
*out_task_id = task_id;
*out_handle = m_rpc_client->DetachReadableHandle(task_id);
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::ReceiveResults(s32 *out_err, s64 *out_size, char *buffer, s64 buffer_size, u32 task_id, s32 desc) {
@ -357,7 +357,7 @@ namespace ams::htcs::impl {
/* Set output. */
*out_err = err;
return ResultSuccess();
R_SUCCEED();
}
/* Check the size. */
@ -380,7 +380,7 @@ namespace ams::htcs::impl {
/* Set output. */
*out_err = err;
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::SelectStart(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) {
@ -395,7 +395,7 @@ namespace ams::htcs::impl {
/* Check that the task isn't cancelled. */
R_UNLESS(!m_rpc_client->IsCancelled<rpc::SelectTask>(task_id), htcs::ResultCancelled());
return ResultSuccess();
R_SUCCEED();
}
Result HtcsService::SelectEnd(s32 *out_err, bool *out_empty, Span<int> read_handles, Span<int> write_handles, Span<int> exception_handles, u32 task_id) {
@ -407,7 +407,7 @@ namespace ams::htcs::impl {
/* Set output. */
*out_err = err;
*out_empty = empty;
return ResultSuccess();
R_SUCCEED();
}
}

4
libraries/libstratosphere/source/htcs/impl/rpc/htcs_data_channel_manager.cpp
View file

@ -56,7 +56,7 @@ namespace ams::htcs::impl::rpc {
/* Wait to receive the data. */
R_TRY(channel.WaitReceive(buffer_size));
return ResultSuccess();
R_SUCCEED();
}
Result DataChannelManager::Send(const void *buffer, s64 buffer_size, u32 task_id) {
@ -92,7 +92,7 @@ namespace ams::htcs::impl::rpc {
/* Wait to send the data. */
R_TRY(channel.Flush());
return ResultSuccess();
R_SUCCEED();
}
}

8
libraries/libstratosphere/source/htcs/impl/rpc/htcs_rpc_accept_task.cpp
View file

@ -25,7 +25,7 @@ namespace ams::htcs::impl::rpc {
/* Set our arguments. */
m_server_handle = server_handle;
return ResultSuccess();
R_SUCCEED();
}
void AcceptTask::Complete(htcs::SocketError err, s32 desc) {
@ -48,7 +48,7 @@ namespace ams::htcs::impl::rpc {
*out_err = m_err;
*out_desc = m_desc;
return ResultSuccess();
R_SUCCEED();
}
Result AcceptTask::ProcessResponse(const char *data, size_t size) {
@ -60,7 +60,7 @@ namespace ams::htcs::impl::rpc {
/* Complete the task. */
this->Complete(static_cast<htcs::SocketError>(packet->params[0]), packet->params[1]);
return ResultSuccess();
R_SUCCEED();
}
Result AcceptTask::CreateRequest(size_t *out, char *data, size_t size, u32 task_id) {
@ -83,7 +83,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output size. */
*out = sizeof(*packet);
return ResultSuccess();
R_SUCCEED();
}
}

8
libraries/libstratosphere/source/htcs/impl/rpc/htcs_rpc_bind_task.cpp
View file

@ -24,7 +24,7 @@ namespace ams::htcs::impl::rpc {
m_peer_name = peer_name;
m_port_name = port_name;
return ResultSuccess();
R_SUCCEED();
}
void BindTask::Complete(htcs::SocketError err) {
@ -42,7 +42,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output. */
*out_err = m_err;
return ResultSuccess();
R_SUCCEED();
}
Result BindTask::ProcessResponse(const char *data, size_t size) {
@ -54,7 +54,7 @@ namespace ams::htcs::impl::rpc {
/* Complete the task. */
this->Complete(static_cast<htcs::SocketError>(packet->params[0]));
return ResultSuccess();
R_SUCCEED();
}
Result BindTask::CreateRequest(size_t *out, char *data, size_t size, u32 task_id) {
@ -79,7 +79,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output size. */
*out = sizeof(*packet) + sizeof(m_peer_name) + sizeof(m_port_name);
return ResultSuccess();
R_SUCCEED();
}
}

8
libraries/libstratosphere/source/htcs/impl/rpc/htcs_rpc_close_task.cpp
View file

@ -22,7 +22,7 @@ namespace ams::htcs::impl::rpc {
/* Set our arguments. */
m_handle = handle;
return ResultSuccess();
R_SUCCEED();
}
void CloseTask::Complete(htcs::SocketError err) {
@ -40,7 +40,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output. */
*out_err = m_err;
return ResultSuccess();
R_SUCCEED();
}
Result CloseTask::ProcessResponse(const char *data, size_t size) {
@ -52,7 +52,7 @@ namespace ams::htcs::impl::rpc {
/* Complete the task. */
this->Complete(static_cast<htcs::SocketError>(packet->params[0]));
return ResultSuccess();
R_SUCCEED();
}
Result CloseTask::CreateRequest(size_t *out, char *data, size_t size, u32 task_id) {
@ -75,7 +75,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output size. */
*out = sizeof(*packet);
return ResultSuccess();
R_SUCCEED();
}
}

8
libraries/libstratosphere/source/htcs/impl/rpc/htcs_rpc_connect_task.cpp
View file

@ -24,7 +24,7 @@ namespace ams::htcs::impl::rpc {
m_peer_name = peer_name;
m_port_name = port_name;
return ResultSuccess();
R_SUCCEED();
}
void ConnectTask::Complete(htcs::SocketError err) {
@ -42,7 +42,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output. */
*out_err = m_err;
return ResultSuccess();
R_SUCCEED();
}
Result ConnectTask::ProcessResponse(const char *data, size_t size) {
@ -54,7 +54,7 @@ namespace ams::htcs::impl::rpc {
/* Complete the task. */
this->Complete(static_cast<htcs::SocketError>(packet->params[0]));
return ResultSuccess();
R_SUCCEED();
}
Result ConnectTask::CreateRequest(size_t *out, char *data, size_t size, u32 task_id) {
@ -79,7 +79,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output size. */
*out = sizeof(*packet) + sizeof(m_peer_name) + sizeof(m_port_name);
return ResultSuccess();
R_SUCCEED();
}
}

8
libraries/libstratosphere/source/htcs/impl/rpc/htcs_rpc_fcntl_task.cpp
View file

@ -24,7 +24,7 @@ namespace ams::htcs::impl::rpc {
m_command = command;
m_value = value;
return ResultSuccess();
R_SUCCEED();
}
void FcntlTask::Complete(htcs::SocketError err, s32 res) {
@ -44,7 +44,7 @@ namespace ams::htcs::impl::rpc {
*out_err = m_err;
*out_res = m_res;
return ResultSuccess();
R_SUCCEED();
}
Result FcntlTask::ProcessResponse(const char *data, size_t size) {
@ -56,7 +56,7 @@ namespace ams::htcs::impl::rpc {
/* Complete the task. */
this->Complete(static_cast<htcs::SocketError>(packet->params[0]), packet->params[1]);
return ResultSuccess();
R_SUCCEED();
}
Result FcntlTask::CreateRequest(size_t *out, char *data, size_t size, u32 task_id) {
@ -81,7 +81,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output size. */
*out = sizeof(*packet);
return ResultSuccess();
R_SUCCEED();
}
}

8
libraries/libstratosphere/source/htcs/impl/rpc/htcs_rpc_listen_task.cpp
View file

@ -23,7 +23,7 @@ namespace ams::htcs::impl::rpc {
m_handle = handle;
m_backlog = backlog;
return ResultSuccess();
R_SUCCEED();
}
void ListenTask::Complete(htcs::SocketError err) {
@ -41,7 +41,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output. */
*out_err = m_err;
return ResultSuccess();
R_SUCCEED();
}
Result ListenTask::ProcessResponse(const char *data, size_t size) {
@ -53,7 +53,7 @@ namespace ams::htcs::impl::rpc {
/* Complete the task. */
this->Complete(static_cast<htcs::SocketError>(packet->params[0]));
return ResultSuccess();
R_SUCCEED();
}
Result ListenTask::CreateRequest(size_t *out, char *data, size_t size, u32 task_id) {
@ -77,7 +77,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output size. */
*out = sizeof(*packet);
return ResultSuccess();
R_SUCCEED();
}
}

8
libraries/libstratosphere/source/htcs/impl/rpc/htcs_rpc_receive_small_task.cpp
View file

@ -27,7 +27,7 @@ namespace ams::htcs::impl::rpc {
m_size = size;
m_flags = flags;
return ResultSuccess();
R_SUCCEED();
}
void ReceiveSmallTask::Complete(htcs::SocketError err, s64 size) {
@ -47,7 +47,7 @@ namespace ams::htcs::impl::rpc {
*out_err = m_err;
*out_size = m_result_size;
return ResultSuccess();
R_SUCCEED();
}
Result ReceiveSmallTask::ProcessResponse(const char *data, size_t size) {
@ -62,7 +62,7 @@ namespace ams::htcs::impl::rpc {
/* Complete the task. */
this->Complete(static_cast<htcs::SocketError>(packet->params[0]), packet->body_size);
return ResultSuccess();
R_SUCCEED();
}
Result ReceiveSmallTask::CreateRequest(size_t *out, char *data, size_t size, u32 task_id) {
@ -87,7 +87,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output size. */
*out = sizeof(*packet);
return ResultSuccess();
R_SUCCEED();
}
bool ReceiveSmallTask::IsReceiveBufferRequired() {

10
libraries/libstratosphere/source/htcs/impl/rpc/htcs_rpc_receive_task.cpp
View file

@ -27,7 +27,7 @@ namespace ams::htcs::impl::rpc {
m_size = size;
m_flags = flags;
return ResultSuccess();
R_SUCCEED();
}
void ReceiveTask::Complete(htcs::SocketError err, s64 size) {
@ -47,7 +47,7 @@ namespace ams::htcs::impl::rpc {
*out_err = m_err;
*out_size = m_result_size;
return ResultSuccess();
R_SUCCEED();
}
Result ReceiveTask::ProcessResponse(const char *data, size_t size) {
@ -59,7 +59,7 @@ namespace ams::htcs::impl::rpc {
/* Complete the task. */
this->Complete(static_cast<htcs::SocketError>(packet->params[0]), packet->params[1]);
return ResultSuccess();
R_SUCCEED();
}
Result ReceiveTask::CreateRequest(size_t *out, char *data, size_t size, u32 task_id) {
@ -85,7 +85,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output size. */
*out = sizeof(*packet);
return ResultSuccess();
R_SUCCEED();
}
Result ReceiveTask::CreateNotification(size_t *out, char *data, size_t size, u32 task_id) {
@ -108,7 +108,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output size. */
*out = sizeof(*packet);
return ResultSuccess();
R_SUCCEED();
}
}

8
libraries/libstratosphere/source/htcs/impl/rpc/htcs_rpc_select_task.cpp
View file

@ -39,7 +39,7 @@ namespace ams::htcs::impl::rpc {
std::memcpy(m_handles + m_read_handle_count, write_handles.data(), write_handles.size_bytes());
std::memcpy(m_handles + m_read_handle_count + m_write_handle_count, exception_handles.data(), exception_handles.size_bytes());
return ResultSuccess();
R_SUCCEED();
}
void SelectTask::Complete(htcs::SocketError err, s32 read_handle_count, s32 write_handle_count, s32 exception_handle_count, const void *body, s64 body_size) {
@ -102,7 +102,7 @@ namespace ams::htcs::impl::rpc {
std::copy(exception_start, exception_end, exception_handles.begin());
}
return ResultSuccess();
R_SUCCEED();
}
Result SelectTask::ProcessResponse(const char *data, size_t size) {
@ -114,7 +114,7 @@ namespace ams::htcs::impl::rpc {
/* Complete the task. */
this->Complete(static_cast<htcs::SocketError>(packet->params[0]), packet->params[1], packet->params[2], packet->params[3], packet->data, size - sizeof(*packet));
return ResultSuccess();
R_SUCCEED();
}
Result SelectTask::CreateRequest(size_t *out, char *data, size_t size, u32 task_id) {
@ -149,7 +149,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output size. */
*out = sizeof(*packet) + body_size;
return ResultSuccess();
R_SUCCEED();
}
}

8
libraries/libstratosphere/source/htcs/impl/rpc/htcs_rpc_send_small_task.cpp
View file

@ -51,7 +51,7 @@ namespace ams::htcs::impl::rpc {
m_size = size;
m_flags = flags;
return ResultSuccess();
R_SUCCEED();
}
void SendSmallTask::Complete(htcs::SocketError err, s64 size) {
@ -74,7 +74,7 @@ namespace ams::htcs::impl::rpc {
*out_err = m_err;
*out_size = m_result_size;
return ResultSuccess();
R_SUCCEED();
}
void SendSmallTask::Cancel(htc::server::rpc::RpcTaskCancelReason reason) {
@ -94,7 +94,7 @@ namespace ams::htcs::impl::rpc {
/* Complete the task. */
this->Complete(static_cast<htcs::SocketError>(packet->params[0]), this->GetSize());
return ResultSuccess();
R_SUCCEED();
}
Result SendSmallTask::CreateRequest(size_t *out, char *data, size_t size, u32 task_id) {
@ -127,7 +127,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output size. */
*out = sizeof(*packet) + this->GetSize();
return ResultSuccess();
R_SUCCEED();
}
bool SendSmallTask::IsSendBufferRequired() {

12
libraries/libstratosphere/source/htcs/impl/rpc/htcs_rpc_send_task.cpp
View file

@ -46,7 +46,7 @@ namespace ams::htcs::impl::rpc {
m_size = size;
m_flags = flags;
return ResultSuccess();
R_SUCCEED();
}
void SendTask::Complete(htcs::SocketError err, s64 size) {
@ -69,7 +69,7 @@ namespace ams::htcs::impl::rpc {
*out_err = m_err;
*out_size = m_result_size;
return ResultSuccess();
R_SUCCEED();
}
void SendTask::Cancel(htc::server::rpc::RpcTaskCancelReason reason) {
@ -89,7 +89,7 @@ namespace ams::htcs::impl::rpc {
/* Complete the task. */
this->Complete(static_cast<htcs::SocketError>(packet->params[0]), packet->params[1]);
return ResultSuccess();
R_SUCCEED();
}
Result SendTask::CreateRequest(size_t *out, char *data, size_t size, u32 task_id) {
@ -115,14 +115,14 @@ namespace ams::htcs::impl::rpc {
/* Set the output size. */
*out = sizeof(*packet);
return ResultSuccess();
R_SUCCEED();
}
Result SendTask::ProcessNotification(const char *data, size_t size) {
AMS_UNUSED(data, size);
this->NotifyDataChannelReady();
return ResultSuccess();
R_SUCCEED();
}
Result SendTask::CreateNotification(size_t *out, char *data, size_t size, u32 task_id) {
@ -145,7 +145,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output size. */
*out = sizeof(*packet);
return ResultSuccess();
R_SUCCEED();
}
}

8
libraries/libstratosphere/source/htcs/impl/rpc/htcs_rpc_shutdown_task.cpp
View file

@ -23,7 +23,7 @@ namespace ams::htcs::impl::rpc {
m_handle = handle;
m_how = how;
return ResultSuccess();
R_SUCCEED();
}
void ShutdownTask::Complete(htcs::SocketError err) {
@ -41,7 +41,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output. */
*out_err = m_err;
return ResultSuccess();
R_SUCCEED();
}
Result ShutdownTask::ProcessResponse(const char *data, size_t size) {
@ -53,7 +53,7 @@ namespace ams::htcs::impl::rpc {
/* Complete the task. */
this->Complete(static_cast<htcs::SocketError>(packet->params[0]));
return ResultSuccess();
R_SUCCEED();
}
Result ShutdownTask::CreateRequest(size_t *out, char *data, size_t size, u32 task_id) {
@ -77,7 +77,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output size. */
*out = sizeof(*packet);
return ResultSuccess();
R_SUCCEED();
}
}

8
libraries/libstratosphere/source/htcs/impl/rpc/htcs_rpc_socket_task.cpp
View file

@ -29,7 +29,7 @@ namespace ams::htcs::impl::rpc {
}
Result SocketTask::SetArguments() {
return ResultSuccess();
R_SUCCEED();
}
void SocketTask::Complete(htcs::SocketError err, s32 desc) {
@ -49,7 +49,7 @@ namespace ams::htcs::impl::rpc {
*out_err = m_err;
*out_desc = m_desc;
return ResultSuccess();
R_SUCCEED();
}
Result SocketTask::ProcessResponse(const char *data, size_t size) {
@ -64,7 +64,7 @@ namespace ams::htcs::impl::rpc {
/* Complete the task. */
this->Complete(static_cast<htcs::SocketError>(packet->params[0]), packet->params[1]);
return ResultSuccess();
R_SUCCEED();
}
Result SocketTask::CreateRequest(size_t *out, char *data, size_t size, u32 task_id) {
@ -87,7 +87,7 @@ namespace ams::htcs::impl::rpc {
/* Set the output size. */
*out = sizeof(*packet);
return ResultSuccess();
R_SUCCEED();
}
}

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

@ -35,12 +35,12 @@ namespace ams::htcs::server {
Result ManagerServiceObject::GetPeerNameAny(sf::Out<htcs::HtcsPeerName> out) {
*out = impl::GetPeerNameAny();
return ResultSuccess();
R_SUCCEED();
}
Result ManagerServiceObject::GetDefaultHostName(sf::Out<htcs::HtcsPeerName> out) {
*out = impl::GetDefaultHostName();
return ResultSuccess();
R_SUCCEED();
}
Result ManagerServiceObject::CreateSocketOld(sf::Out<s32> out_err, sf::Out<sf::SharedPointer<tma::ISocket>> out) {
@ -61,19 +61,19 @@ namespace ams::htcs::server {
/* Create a new socket object. */
*out = ServiceObjectFactory::CreateSharedEmplaced<tma::ISocket, SocketServiceObject>(this, desc);
return ResultSuccess();
R_SUCCEED();
}
Result ManagerServiceObject::RegisterProcessId(const sf::ClientProcessId &client_pid) {
/* NOTE: Nintendo does nothing here. */
AMS_UNUSED(client_pid);
return ResultSuccess();
R_SUCCEED();
}
Result ManagerServiceObject::MonitorManager(const sf::ClientProcessId &client_pid) {
/* NOTE: Nintendo does nothing here. */
AMS_UNUSED(client_pid);
return ResultSuccess();
R_SUCCEED();
}
Result ManagerServiceObject::StartSelect(sf::Out<u32> out_task_id, sf::OutCopyHandle out_event, const sf::InMapAliasArray<s32> &read_handles, const sf::InMapAliasArray<s32> &write_handles, const sf::InMapAliasArray<s32> &exception_handles, s64 tv_sec, s64 tv_usec) {
@ -86,7 +86,7 @@ namespace ams::htcs::server {
/* Set the output event handle. */
out_event.SetValue(event_handle, true);
return ResultSuccess();
R_SUCCEED();
}
Result ManagerServiceObject::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) {

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

@ -40,7 +40,7 @@ namespace ams::htcs::server {
/* Close the underlying socket. */
manager->Close(out_err.GetPointer(), out_res.GetPointer(), m_desc);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::Connect(sf::Out<s32> out_err, sf::Out<s32> out_res, const htcs::SockAddrHtcs &address) {
@ -50,7 +50,7 @@ namespace ams::htcs::server {
/* Perform the connect. */
manager->Connect(out_err.GetPointer(), out_res.GetPointer(), address, m_desc);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::Bind(sf::Out<s32> out_err, sf::Out<s32> out_res, const htcs::SockAddrHtcs &address) {
@ -60,7 +60,7 @@ namespace ams::htcs::server {
/* Perform the bind. */
manager->Bind(out_err.GetPointer(), out_res.GetPointer(), address, m_desc);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::Listen(sf::Out<s32> out_err, sf::Out<s32> out_res, s32 backlog_count) {
@ -70,7 +70,7 @@ namespace ams::htcs::server {
/* Perform the listen. */
manager->Listen(out_err.GetPointer(), out_res.GetPointer(), backlog_count, m_desc);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::Recv(sf::Out<s32> out_err, sf::Out<s64> out_size, const sf::OutAutoSelectBuffer &buffer, s32 flags) {
@ -80,7 +80,7 @@ namespace ams::htcs::server {
/* Perform the recv. */
manager->Recv(out_err.GetPointer(), out_size.GetPointer(), reinterpret_cast<char *>(buffer.GetPointer()), buffer.GetSize(), flags, m_desc);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::Send(sf::Out<s32> out_err, sf::Out<s64> out_size, const sf::InAutoSelectBuffer &buffer, s32 flags) {
@ -90,7 +90,7 @@ namespace ams::htcs::server {
/* Perform the send. */
manager->Send(out_err.GetPointer(), out_size.GetPointer(), reinterpret_cast<const char *>(buffer.GetPointer()), buffer.GetSize(), flags, m_desc);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::Shutdown(sf::Out<s32> out_err, sf::Out<s32> out_res, s32 how) {
@ -100,7 +100,7 @@ namespace ams::htcs::server {
/* Perform the shutdown. */
manager->Shutdown(out_err.GetPointer(), out_res.GetPointer(), how, m_desc);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::Fcntl(sf::Out<s32> out_err, sf::Out<s32> out_res, s32 command, s32 value) {
@ -110,7 +110,7 @@ namespace ams::htcs::server {
/* Perform the fcntl. */
manager->Fcntl(out_err.GetPointer(), out_res.GetPointer(), command, value, m_desc);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::AcceptStart(sf::Out<u32> out_task_id, sf::OutCopyHandle out_event) {
@ -123,7 +123,7 @@ namespace ams::htcs::server {
/* Set the output event handle. */
out_event.SetValue(event_handle, true);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::AcceptResults(sf::Out<s32> out_err, sf::Out<sf::SharedPointer<tma::ISocket>> out, sf::Out<htcs::SockAddrHtcs> out_address, u32 task_id) {
@ -140,7 +140,7 @@ namespace ams::htcs::server {
/* Create a new socket object. */
*out = ServiceObjectFactory::CreateSharedEmplaced<tma::ISocket, SocketServiceObject>(m_manager.Get(), desc);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::RecvStart(sf::Out<u32> out_task_id, sf::OutCopyHandle out_event, s32 mem_size, s32 flags) {
@ -153,7 +153,7 @@ namespace ams::htcs::server {
/* Set the output event handle. */
out_event.SetValue(event_handle, true);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::RecvResults(sf::Out<s32> out_err, sf::Out<s64> out_size, const sf::OutAutoSelectBuffer &buffer, u32 task_id) {
@ -163,7 +163,7 @@ namespace ams::htcs::server {
/* Get the recv results. */
manager->RecvResults(out_err.GetPointer(), out_size.GetPointer(), reinterpret_cast<char *>(buffer.GetPointer()), buffer.GetSize(), task_id, m_desc);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::RecvLargeStart(sf::Out<u32> out_task_id, sf::OutCopyHandle out_event, s32 unaligned_size_start, s32 unaligned_size_end, s64 aligned_size, sf::CopyHandle &&mem_handle, s32 flags) {
@ -190,7 +190,7 @@ namespace ams::htcs::server {
/* Set the output event handle. */
out_event.SetValue(event_handle, true);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::SendStartOld(sf::Out<u32> out_task_id, sf::OutCopyHandle out_event, const sf::InAutoSelectBuffer &buffer, s32 flags) {
@ -227,7 +227,7 @@ namespace ams::htcs::server {
/* Set the output event handle. */
out_event.SetValue(event_handle, true);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::SendResults(sf::Out<s32> out_err, sf::Out<s64> out_size, u32 task_id) {
@ -237,7 +237,7 @@ namespace ams::htcs::server {
/* Get the send results. */
manager->SendResults(out_err.GetPointer(), out_size.GetPointer(), task_id, m_desc);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::StartSend(sf::Out<u32> out_task_id, sf::OutCopyHandle out_event, sf::Out<s64> out_max_size, s64 size, s32 flags) {
@ -253,7 +253,7 @@ namespace ams::htcs::server {
/* Set the output event handle. */
out_event.SetValue(event_handle, true);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::ContinueSendOld(sf::Out<s64> out_size, sf::Out<bool> out_wait, const sf::InAutoSelectBuffer &buffer, u32 task_id) {
@ -267,7 +267,7 @@ namespace ams::htcs::server {
/* End the send. */
manager->EndSend(out_err.GetPointer(), out_size.GetPointer(), task_id, m_desc);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::StartRecv(sf::Out<u32> out_task_id, sf::OutCopyHandle out_event, s64 size, s32 flags) {
@ -280,7 +280,7 @@ namespace ams::htcs::server {
/* Set the output event handle. */
out_event.SetValue(event_handle, true);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::EndRecv(sf::Out<s32> out_err, sf::Out<s64> out_size, const sf::OutAutoSelectBuffer &buffer, u32 task_id) {
@ -290,7 +290,7 @@ namespace ams::htcs::server {
/* End the recv. */
manager->EndRecv(out_err.GetPointer(), out_size.GetPointer(), reinterpret_cast<char *>(buffer.GetPointer()), buffer.GetSize(), task_id, m_desc);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::SendStart(sf::Out<u32> out_task_id, sf::OutCopyHandle out_event, const sf::InNonSecureAutoSelectBuffer &buffer, s32 flags) {
@ -306,7 +306,7 @@ namespace ams::htcs::server {
/* Set the output event handle. */
out_event.SetValue(event_handle, true);
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::ContinueSend(sf::Out<s64> out_size, sf::Out<bool> out_wait, const sf::InNonSecureAutoSelectBuffer &buffer, u32 task_id) {
@ -321,13 +321,13 @@ namespace ams::htcs::server {
/* We aren't doing a waiting send. */
*out_wait = false;
return ResultSuccess();
R_SUCCEED();
}
Result SocketServiceObject::GetPrimitive(sf::Out<s32> out) {
/* Get our descriptor. */
*out = m_desc;
return ResultSuccess();
R_SUCCEED();
}
}