ams: use R_SUCCEED, R_THROW globally
This commit is contained in:
@@ -48,7 +48,7 @@ namespace ams::sprofile::srv {
|
||||
|
||||
/* Return the object. */
|
||||
*out = std::move(obj);
|
||||
return ResultSuccess();
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
void ProfileUpdateObserverManager::CloseObserver(ProfileUpdateObserverImpl *observer) {
|
||||
|
||||
@@ -48,7 +48,7 @@ namespace ams::sprofile::srv {
|
||||
|
||||
/* Add the profile. */
|
||||
m_profiles[m_profile_count++] = profile;
|
||||
return ResultSuccess();
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result Unlisten(Identifier profile) {
|
||||
@@ -57,16 +57,16 @@ namespace ams::sprofile::srv {
|
||||
if (m_profiles[i] == profile) {
|
||||
m_profiles[i] = m_profiles[--m_profile_count];
|
||||
AMS_ABORT_UNLESS(m_profile_count >= 0);
|
||||
return ResultSuccess();
|
||||
R_SUCCEED();
|
||||
}
|
||||
}
|
||||
|
||||
return sprofile::ResultNotListening();
|
||||
R_THROW(sprofile::ResultNotListening());
|
||||
}
|
||||
|
||||
Result GetEventHandle(sf::OutCopyHandle out) {
|
||||
out.SetValue(m_event.GetReadableHandle(), false);
|
||||
return ResultSuccess();
|
||||
R_SUCCEED();
|
||||
}
|
||||
public:
|
||||
void OnUpdate(Identifier profile) {
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace ams::sprofile::srv {
|
||||
|
||||
/* Return the object. */
|
||||
*out = std::move(obj);
|
||||
return ResultSuccess();
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result ServiceForBgAgent::GetImportableProfileUrls(sf::Out<u32> out_count, const sf::OutArray<sprofile::srv::ProfileUrl> &out, const sprofile::srv::ProfileMetadataForImportMetadata &arg) {
|
||||
@@ -71,7 +71,7 @@ namespace ams::sprofile::srv {
|
||||
|
||||
/* Set output count. */
|
||||
*out_count = count;
|
||||
return ResultSuccess();
|
||||
R_SUCCEED();
|
||||
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@ namespace ams::sprofile::srv {
|
||||
|
||||
/* Determine if update is needed. */
|
||||
*out = !(loaded_metadata && revision_key == primary_metadata.revision_key);
|
||||
return ResultSuccess();
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result ServiceForBgAgent::Reset() {
|
||||
|
||||
@@ -28,7 +28,7 @@ namespace ams::sprofile::srv {
|
||||
|
||||
/* Return the object. */
|
||||
*out = std::move(obj);
|
||||
return ResultSuccess();
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result ServiceForSystemProcess::OpenProfileUpdateObserver(sf::Out<sf::SharedPointer<::ams::sprofile::srv::IProfileUpdateObserver>> out) {
|
||||
@@ -45,7 +45,7 @@ namespace ams::sprofile::srv {
|
||||
|
||||
/* Return the object. */
|
||||
*out = std::move(obj);
|
||||
return ResultSuccess();
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user