ams: use R_SUCCEED, R_THROW globally
This commit is contained in:
@@ -135,7 +135,7 @@ namespace ams::tipc::impl {
|
||||
if constexpr (HasDefaultServiceCommandProcessor<ImplType>) { \
|
||||
return impl->ProcessDefaultServiceCommand(message_buffer); \
|
||||
} else { \
|
||||
return tipc::ResultInvalidMethod(); \
|
||||
R_THROW(tipc::ResultInvalidMethod()); \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
|
||||
@@ -572,7 +572,7 @@ namespace ams::tipc::impl {
|
||||
R_UNLESS(message_buffer.Get32(SpecialHeaderIndex) == ExpectedSpecialHeader, tipc::ResultInvalidMessageFormat());
|
||||
}
|
||||
|
||||
return ResultSuccess();
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
template<size_t Ix>
|
||||
@@ -631,14 +631,14 @@ namespace ams::tipc::impl {
|
||||
return (object->*ServiceCommandImpl)(Processor::template DeserializeArgument<Ix>(message_buffer, out_raw_holder, out_handles_holder)...);
|
||||
} else {
|
||||
(object->*ServiceCommandImpl)(Processor::template DeserializeArgument<Ix>(message_buffer, out_raw_holder, out_handles_holder)...);
|
||||
return ResultSuccess();
|
||||
R_SUCCEED();
|
||||
}
|
||||
}(std::make_index_sequence<std::tuple_size<typename CommandMeta::ArgsType>::value>());
|
||||
|
||||
/* Serialize output. */
|
||||
Processor::SerializeResults(message_buffer, command_result, out_raw_holder, out_handles_holder);
|
||||
|
||||
return ResultSuccess();
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -122,7 +122,7 @@ namespace ams::tipc {
|
||||
|
||||
return result;
|
||||
} else {
|
||||
return ResultSuccess();
|
||||
R_SUCCEED();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -319,7 +319,7 @@ namespace ams::tipc {
|
||||
const Result method_result = message_buffer.GetRaw<u32>(raw_data_offset);
|
||||
|
||||
/* Check that the result is the special deferral result. */
|
||||
return tipc::ResultRequestDeferred::Includes(method_result);
|
||||
R_THROW(tipc::ResultRequestDeferred::Includes(method_result));
|
||||
} else {
|
||||
/* If deferral isn't supported, requests are never deferred. */
|
||||
return false;
|
||||
@@ -501,7 +501,7 @@ namespace ams::tipc {
|
||||
/* Add the session to the least burdened manager. */
|
||||
best_manager->AddSession(session_handle, object);
|
||||
|
||||
return ResultSuccess();
|
||||
R_SUCCEED();
|
||||
}
|
||||
private:
|
||||
template<size_t Ix> requires (Ix < NumPorts)
|
||||
@@ -795,7 +795,7 @@ namespace ams::tipc {
|
||||
/* Add the session to our manager. */
|
||||
m_port_manager.AddSession(session_handle, object);
|
||||
|
||||
return ResultSuccess();
|
||||
R_SUCCEED();
|
||||
}
|
||||
private:
|
||||
void LoopProcess(PortManagerBase &port_manager) {
|
||||
|
||||
Reference in New Issue
Block a user