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

8
libraries/libstratosphere/source/htc/server/driver/htc_htclow_driver.cpp
View file

@ -61,7 +61,7 @@ namespace ams::htc::server::driver {
m_manager->SetReceiveBuffer(GetHtclowChannel(channel, m_module_id), receive_buffer, receive_buffer_size);
m_manager->SetSendBuffer(GetHtclowChannel(channel, m_module_id), send_buffer, send_buffer_size);
return ResultSuccess();
R_SUCCEED();
}
void HtclowDriver::Close(htclow::ChannelId channel) {
@ -84,7 +84,7 @@ namespace ams::htc::server::driver {
/* Finish connecting. */
R_TRY(m_manager->ConnectEnd(GetHtclowChannel(channel, m_module_id), task_id));
return ResultSuccess();
R_SUCCEED();
}
void HtclowDriver::Shutdown(htclow::ChannelId channel) {
@ -117,7 +117,7 @@ namespace ams::htc::server::driver {
/* Set the output sent size. */
*out = static_cast<s64>(sent);
return ResultSuccess();
R_SUCCEED();
}
Result HtclowDriver::ReceiveInternal(size_t *out, void *dst, size_t dst_size, htclow::ChannelId channel, htclow::ReceiveOption option) {
@ -173,7 +173,7 @@ namespace ams::htc::server::driver {
/* Set the output received size. */
*out = static_cast<s64>(received);
return ResultSuccess();
R_SUCCEED();
}
htclow::ChannelState HtclowDriver::GetChannelState(htclow::ChannelId channel) {

10
libraries/libstratosphere/source/htc/server/htc_htc_service_object.cpp
View file

@ -39,7 +39,7 @@ namespace ams::htc::server {
/* Set the output size. */
*out_size = static_cast<s32>(var_size);
return ResultSuccess();
R_SUCCEED();
}
Result HtcServiceObject::GetEnvironmentVariableLength(sf::Out<s32> out_size, const sf::InBuffer &name) {
@ -52,19 +52,19 @@ namespace ams::htc::server {
/* Set the output size. */
*out_size = static_cast<s32>(var_size);
return ResultSuccess();
R_SUCCEED();
}
Result HtcServiceObject::GetHostConnectionEvent(sf::OutCopyHandle out) {
/* Set the output handle. */
out.SetValue(m_observer.GetConnectEvent()->GetReadableHandle(), false);
return ResultSuccess();
R_SUCCEED();
}
Result HtcServiceObject::GetHostDisconnectionEvent(sf::OutCopyHandle out) {
/* Set the output handle. */
out.SetValue(m_observer.GetDisconnectEvent()->GetReadableHandle(), false);
return ResultSuccess();
R_SUCCEED();
}
Result HtcServiceObject::GetHostConnectionEventForSystem(sf::OutCopyHandle out) {
@ -100,7 +100,7 @@ namespace ams::htc::server {
/* Set the output event. */
out.SetValue(event_handle, true);
return ResultSuccess();
R_SUCCEED();
}
Result HtcServiceObject::RunOnHostResults(sf::Out<s32> out_result, u32 id) {

8
libraries/libstratosphere/source/htc/server/htc_htcmisc_impl.cpp
View file

@ -91,7 +91,7 @@ namespace ams::htc::server {
/* Finish the task. */
R_TRY(m_rpc_client.End<rpc::GetEnvironmentVariableTask>(task_id, out_size, dst, dst_size));
return ResultSuccess();
R_SUCCEED();
}
Result HtcmiscImpl::GetEnvironmentVariableLength(size_t *out_size, const char *name, size_t name_size) {
@ -105,7 +105,7 @@ namespace ams::htc::server {
/* Finish the task. */
R_TRY(m_rpc_client.End<rpc::GetEnvironmentVariableLengthTask>(task_id, out_size));
return ResultSuccess();
R_SUCCEED();
}
Result HtcmiscImpl::RunOnHostBegin(u32 *out_task_id, os::NativeHandle *out_event, const char *args, size_t args_size) {
@ -117,7 +117,7 @@ namespace ams::htc::server {
*out_task_id = task_id;
*out_event = m_rpc_client.DetachReadableHandle(task_id);
return ResultSuccess();
R_SUCCEED();
}
Result HtcmiscImpl::RunOnHostEnd(s32 *out_result, u32 task_id) {
@ -128,7 +128,7 @@ namespace ams::htc::server {
/* Set output. */
*out_result = res;
return ResultSuccess();
R_SUCCEED();
}
void HtcmiscImpl::ClientThread() {

2
libraries/libstratosphere/source/htc/server/htc_observer.cpp
View file

@ -56,7 +56,7 @@ namespace ams::htc::server {
/* Start our thread. */
os::StartThread(std::addressof(m_observer_thread));
return ResultSuccess();
R_SUCCEED();
}
void Observer::UpdateEvent() {

8
libraries/libstratosphere/source/htc/server/rpc/htc_htcmisc_rpc_server.cpp
View file

@ -62,7 +62,7 @@ namespace ams::htc::server::rpc {
m_cancelled = false;
m_thread_running = true;
return ResultSuccess();
R_SUCCEED();
}
void HtcmiscRpcServer::Cancel() {
@ -147,7 +147,7 @@ namespace ams::htc::server::rpc {
/* Check size. */
R_UNLESS(static_cast<size_t>(received) == sizeof(*header), htc::ResultInvalidSize());
return ResultSuccess();
R_SUCCEED();
}
Result HtcmiscRpcServer::ReceiveBody(char *dst, size_t size) {
@ -158,7 +158,7 @@ namespace ams::htc::server::rpc {
/* Check size. */
R_UNLESS(static_cast<size_t>(received) == size, htc::ResultInvalidSize());
return ResultSuccess();
R_SUCCEED();
}
Result HtcmiscRpcServer::SendRequest(const char *src, size_t size) {
@ -172,7 +172,7 @@ namespace ams::htc::server::rpc {
/* Check that we sent the right amount. */
R_UNLESS(sent == static_cast<s64>(size), htc::ResultInvalidSize());
return ResultSuccess();
R_SUCCEED();
}
}

24
libraries/libstratosphere/source/htc/server/rpc/htc_htcmisc_rpc_tasks.cpp
View file

@ -27,7 +27,7 @@ namespace ams::htc::server::rpc {
R_UNLESS(size == copied || size == copied + 1, htc::ResultUnknown());
return ResultSuccess();
R_SUCCEED();
}
void GetEnvironmentVariableTask::Complete(HtcmiscResult result, const char *data, size_t size) {
@ -78,7 +78,7 @@ namespace ams::htc::server::rpc {
/* Set the output size. */
*out = m_value_size;
return ResultSuccess();
R_SUCCEED();
}
Result GetEnvironmentVariableTask::CreateRequest(size_t *out, char *data, size_t size, u32 task_id) {
@ -106,7 +106,7 @@ namespace ams::htc::server::rpc {
/* Set the output size. */
*out = sizeof(*packet) + this->GetNameSize();
return ResultSuccess();
R_SUCCEED();
}
Result GetEnvironmentVariableTask::ProcessResponse(const char *data, size_t size) {
@ -119,7 +119,7 @@ namespace ams::htc::server::rpc {
/* Complete the task. */
Task::Complete();
return ResultSuccess();
R_SUCCEED();
}
Result GetEnvironmentVariableLengthTask::SetArguments(const char *args, size_t size) {
@ -131,7 +131,7 @@ namespace ams::htc::server::rpc {
R_UNLESS(size == copied || size == copied + 1, htc::ResultUnknown());
return ResultSuccess();
R_SUCCEED();
}
void GetEnvironmentVariableLengthTask::Complete(HtcmiscResult result, const char *data, size_t size) {
@ -177,7 +177,7 @@ namespace ams::htc::server::rpc {
/* Set the output size. */
*out = m_value_size;
return ResultSuccess();
R_SUCCEED();
}
Result GetEnvironmentVariableLengthTask::CreateRequest(size_t *out, char *data, size_t size, u32 task_id) {
@ -205,7 +205,7 @@ namespace ams::htc::server::rpc {
/* Set the output size. */
*out = sizeof(*packet) + this->GetNameSize();
return ResultSuccess();
R_SUCCEED();
}
Result GetEnvironmentVariableLengthTask::ProcessResponse(const char *data, size_t size) {
@ -218,7 +218,7 @@ namespace ams::htc::server::rpc {
/* Complete the task. */
Task::Complete();
return ResultSuccess();
R_SUCCEED();
}
Result RunOnHostTask::SetArguments(const char *args, size_t size) {
@ -229,7 +229,7 @@ namespace ams::htc::server::rpc {
std::memcpy(m_command, args, size);
m_command_size = size;
return ResultSuccess();
R_SUCCEED();
}
void RunOnHostTask::Complete(int host_result) {
@ -245,7 +245,7 @@ namespace ams::htc::server::rpc {
Result RunOnHostTask::GetResult(int *out) const {
*out = m_host_result;
return ResultSuccess();
R_SUCCEED();
}
void RunOnHostTask::Cancel(RpcTaskCancelReason reason) {
@ -281,7 +281,7 @@ namespace ams::htc::server::rpc {
/* Set the output size. */
*out = sizeof(*packet) + this->GetCommandSize();
return ResultSuccess();
R_SUCCEED();
}
Result RunOnHostTask::ProcessResponse(const char *data, size_t size) {
@ -290,7 +290,7 @@ namespace ams::htc::server::rpc {
AMS_UNUSED(size);
this->Complete(reinterpret_cast<const HtcmiscRpcPacket *>(data)->params[0]);
return ResultSuccess();
R_SUCCEED();
}
os::SystemEventType *RunOnHostTask::GetSystemEvent() {

12
libraries/libstratosphere/source/htc/server/rpc/htc_rpc_client.cpp
View file

@ -139,7 +139,7 @@ namespace ams::htc::server::rpc {
os::ClearEvent(std::addressof(m_send_buffer_available_events[i]));
}
return ResultSuccess();
R_SUCCEED();
}
void RpcClient::Cancel() {
@ -251,7 +251,7 @@ namespace ams::htc::server::rpc {
R_TRY(task->ProcessNotification(m_receive_buffer, received));
break;
default:
return htc::ResultInvalidCategory();
R_THROW(htc::ResultInvalidCategory());
}
/* If we used the receive buffer, signal that we're done with it. */
@ -269,7 +269,7 @@ namespace ams::htc::server::rpc {
/* Check size. */
R_UNLESS(static_cast<size_t>(received) == sizeof(*header), htc::ResultInvalidSize());
return ResultSuccess();
R_SUCCEED();
}
Result RpcClient::ReceiveBody(char *dst, size_t size) {
@ -280,7 +280,7 @@ namespace ams::htc::server::rpc {
/* Check size. */
R_UNLESS(static_cast<size_t>(received) == size, htc::ResultInvalidSize());
return ResultSuccess();
R_SUCCEED();
}
Result RpcClient::SendThread() {
@ -325,7 +325,7 @@ namespace ams::htc::server::rpc {
R_TRY(this->SendRequest(m_send_buffer, packet_size));
}
return htc::ResultCancelled();
R_THROW(htc::ResultCancelled());
}
Result RpcClient::SendRequest(const char *src, size_t size) {
@ -339,7 +339,7 @@ namespace ams::htc::server::rpc {
/* Check that we sent the right amount. */
R_UNLESS(sent == static_cast<s64>(size), htc::ResultInvalidSize());
return ResultSuccess();
R_SUCCEED();
}
void RpcClient::CancelBySocket(s32 handle) {

28
libraries/libstratosphere/source/htc/server/rpc/htc_rpc_client.hpp
View file

@ -147,7 +147,7 @@ namespace ams::htc::server::rpc {
/* We succeeded. */
task_guard.Cancel();
return ResultSuccess();
R_SUCCEED();
}
template<typename T, typename... Args> requires (IsRpcTask<T> && sizeof...(Args) == std::tuple_size<RpcTaskResultsType<T>>::value)
@ -165,7 +165,7 @@ namespace ams::htc::server::rpc {
/* Get the task's result. */
R_TRY(task->GetResult(std::forward<Args>(args)...));
return ResultSuccess();
R_SUCCEED();
}
template<typename T, typename... Args> requires (IsRpcTask<T> && sizeof...(Args) == std::tuple_size<RpcTaskResultsType<T>>::value)
@ -190,11 +190,11 @@ namespace ams::htc::server::rpc {
switch (task->GetTaskCancelReason()) {
case RpcTaskCancelReason::BySocket:
task_guard.Cancel();
return htc::ResultTaskCancelled();
R_THROW(htc::ResultTaskCancelled());
case RpcTaskCancelReason::ClientFinalized:
return htc::ResultCancelled();
R_THROW(htc::ResultCancelled());
case RpcTaskCancelReason::QueueNotAvailable:
return htc::ResultTaskQueueNotAvailable();
R_THROW(htc::ResultTaskQueueNotAvailable());
AMS_UNREACHABLE_DEFAULT_CASE();
}
}
@ -202,7 +202,7 @@ namespace ams::htc::server::rpc {
/* Get the task's result. */
R_TRY(task->GetResult(std::forward<Args>(args)...));
return ResultSuccess();
R_SUCCEED();
}
template<typename T> requires IsRpcTask<T>
@ -217,7 +217,7 @@ namespace ams::htc::server::rpc {
/* Check the task handle. */
R_UNLESS(task->GetHandle() == handle, htc::ResultInvalidTaskId());
return ResultSuccess();
R_SUCCEED();
}
template<typename T> requires IsRpcTask<T>
@ -235,7 +235,7 @@ namespace ams::htc::server::rpc {
/* Add notification to our queue. */
m_task_queue.Add(task_id, PacketCategory::Notification);
return ResultSuccess();
R_SUCCEED();
}
template<typename T> requires IsRpcTask<T>
@ -291,9 +291,9 @@ namespace ams::htc::server::rpc {
if (task->GetTaskState() == RpcTaskState::Cancelled) {
switch (task->GetTaskCancelReason()) {
case RpcTaskCancelReason::QueueNotAvailable:
return htc::ResultTaskQueueNotAvailable();
R_THROW(htc::ResultTaskQueueNotAvailable());
default:
return htc::ResultTaskCancelled();
R_THROW(htc::ResultTaskCancelled());
}
}
@ -303,7 +303,7 @@ namespace ams::htc::server::rpc {
os::SignalEvent(std::addressof(m_send_buffer_available_events[task_id]));
}
return ResultSuccess();
R_SUCCEED();
}
template<typename T> requires IsRpcTask<T>
@ -323,9 +323,9 @@ namespace ams::htc::server::rpc {
if (task->GetTaskState() == RpcTaskState::Cancelled) {
switch (task->GetTaskCancelReason()) {
case RpcTaskCancelReason::QueueNotAvailable:
return htc::ResultTaskQueueNotAvailable();
R_THROW(htc::ResultTaskQueueNotAvailable());
default:
return htc::ResultTaskCancelled();
R_THROW(htc::ResultTaskCancelled());
}
}
@ -349,7 +349,7 @@ namespace ams::htc::server::rpc {
std::memcpy(buffer, result_buffer, result_size);
return ResultSuccess();
R_SUCCEED();
}
};

2
libraries/libstratosphere/source/htc/server/rpc/htc_rpc_task_id_free_list.hpp
View file

@ -43,7 +43,7 @@ namespace ams::htc::server::rpc {
/* Get the task id. */
*out = m_task_ids[index];
return ResultSuccess();
R_SUCCEED();
}
void Free(u32 task_id) {

2
libraries/libstratosphere/source/htc/server/rpc/htc_rpc_task_queue.hpp
View file

@ -96,7 +96,7 @@ namespace ams::htc::server::rpc {
/* Return the task info. */
*out_id = m_task_ids[index];
*out_category = m_task_categories[index];
return ResultSuccess();
R_SUCCEED();
}
};

8
libraries/libstratosphere/source/htc/server/rpc/htc_rpc_tasks.hpp
View file

@ -89,22 +89,22 @@ namespace ams::htc::server::rpc {
virtual Result ProcessResponse(const char *data, size_t size) {
AMS_UNUSED(data, size);
return ResultSuccess();
R_SUCCEED();
}
virtual Result CreateRequest(size_t *out, char *data, size_t size, u32 task_id) {
AMS_UNUSED(out, data, size, task_id);
return ResultSuccess();
R_SUCCEED();
}
virtual Result ProcessNotification(const char *data, size_t size) {
AMS_UNUSED(data, size);
return ResultSuccess();
R_SUCCEED();
}
virtual Result CreateNotification(size_t *out, char *data, size_t size, u32 task_id) {
AMS_UNUSED(out, data, size, task_id);
return ResultSuccess();
R_SUCCEED();
}
virtual bool IsReceiveBufferRequired() {

2
libraries/libstratosphere/source/htc/tenv/htc_tenv_service_manager.cpp
View file

@ -21,7 +21,7 @@ namespace ams::htc::tenv {
Result ServiceManager::GetServiceInterface(sf::Out<sf::SharedPointer<htc::tenv::IService>> out, const sf::ClientProcessId &process_id) {
*out = impl::SfObjectFactory::CreateSharedEmplaced<htc::tenv::IService, Service>(process_id.GetValue());
return ResultSuccess();
R_SUCCEED();
}
}