OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 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

6
libraries/libstratosphere/source/htc/server/driver/htc_htclow_driver.cpp
View File

@@ -50,7 +50,7 @@ namespace ams::htc::server::driver {
AMS_ABORT("Unsupported channel");
}
return this->Open(channel, m_default_receive_buffer, sizeof(m_default_receive_buffer), m_default_send_buffer, sizeof(m_default_send_buffer));
R_RETURN(this->Open(channel, m_default_receive_buffer, sizeof(m_default_receive_buffer), m_default_send_buffer, sizeof(m_default_send_buffer)));
}
Result HtclowDriver::Open(htclow::ChannelId channel, void *receive_buffer, size_t receive_buffer_size, void *send_buffer, size_t send_buffer_size) {
@@ -132,7 +132,7 @@ namespace ams::htc::server::driver {
this->WaitTask(task_id);
/* Finish receiving. */
return m_manager->ReceiveEnd(out, dst, dst_size, GetHtclowChannel(channel, m_module_id), task_id);
R_RETURN(m_manager->ReceiveEnd(out, dst, dst_size, GetHtclowChannel(channel, m_module_id), task_id));
}
Result HtclowDriver::Receive(s64 *out, void *dst, s64 dst_size, htclow::ChannelId channel, htclow::ReceiveOption option) {
@@ -164,7 +164,7 @@ namespace ams::htc::server::driver {
if (htclow::ResultChannelNotExist::Includes(result)) {
*out = received;
}
return result;
R_RETURN(result);
}
received += cur_received;

6
libraries/libstratosphere/source/htc/server/htc_htc_service_object.cpp
View File

@@ -80,11 +80,11 @@ namespace ams::htc::server {
}
Result HtcServiceObject::GetWorkingDirectoryPath(const sf::OutBuffer &out, s32 max_len) {
return htcfs::GetWorkingDirectory(reinterpret_cast<char *>(out.GetPointer()), max_len);
R_RETURN(htcfs::GetWorkingDirectory(reinterpret_cast<char *>(out.GetPointer()), max_len));
}
Result HtcServiceObject::GetWorkingDirectoryPathSize(sf::Out<s32> out_size) {
return htcfs::GetWorkingDirectorySize(out_size.GetPointer());
R_RETURN(htcfs::GetWorkingDirectorySize(out_size.GetPointer()));
}
Result HtcServiceObject::RunOnHostStart(sf::Out<u32> out_id, sf::OutCopyHandle out, const sf::InBuffer &args) {
@@ -111,7 +111,7 @@ namespace ams::htc::server {
}
/* Finish the run on host task. */
return m_misc_impl.RunOnHostEnd(out_result.GetPointer(), id);
R_RETURN(m_misc_impl.RunOnHostEnd(out_result.GetPointer(), id));
}
Result HtcServiceObject::GetBridgeIpAddress(const sf::OutBuffer &out) {