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

12
libraries/libstratosphere/source/erpt/srv/erpt_srv_attachment.cpp
View File

@@ -46,18 +46,18 @@ namespace ams::erpt::srv {
Result Attachment::Open(AttachmentOpenType type) {
switch (type) {
case AttachmentOpenType_Create: return this->OpenStream(this->FileName().name, StreamMode_Write, AttachmentStreamBufferSize);
case AttachmentOpenType_Read: return this->OpenStream(this->FileName().name, StreamMode_Read, AttachmentStreamBufferSize);
case AttachmentOpenType_Create: R_RETURN(this->OpenStream(this->FileName().name, StreamMode_Write, AttachmentStreamBufferSize));
case AttachmentOpenType_Read: R_RETURN(this->OpenStream(this->FileName().name, StreamMode_Read, AttachmentStreamBufferSize));
default: R_THROW(erpt::ResultInvalidArgument());
}
}
Result Attachment::Read(u32 *out_read_count, u8 *dst, u32 dst_size) {
return this->ReadStream(out_read_count, dst, dst_size);
R_RETURN(this->ReadStream(out_read_count, dst, dst_size));
}
Result Attachment::Delete() {
return this->DeleteStream(this->FileName().name);
R_RETURN(this->DeleteStream(this->FileName().name));
}
void Attachment::Close() {
@@ -72,13 +72,13 @@ namespace ams::erpt::srv {
Result Attachment::SetFlags(AttachmentFlagSet flags) {
if (((~m_record->m_info.flags) & flags).IsAnySet()) {
m_record->m_info.flags |= flags;
return Journal::Commit();
R_RETURN(Journal::Commit());
}
R_SUCCEED();
}
Result Attachment::GetSize(s64 *out) const {
return this->GetStreamSize(out);
R_RETURN(this->GetStreamSize(out));
}
}

4
libraries/libstratosphere/source/erpt/srv/erpt_srv_attachment.hpp
View File

@@ -50,12 +50,12 @@ namespace ams::erpt::srv {
template<typename T>
Result Write(T val) {
return this->WriteStream(reinterpret_cast<const u8 *>(std::addressof(val)), sizeof(val));
R_RETURN(this->WriteStream(reinterpret_cast<const u8 *>(std::addressof(val)), sizeof(val)));
}
template<typename T>
Result Write(const T *buf, u32 buffer_size) {
return this->WriteStream(reinterpret_cast<const u8 *>(buf), buffer_size);
R_RETURN(this->WriteStream(reinterpret_cast<const u8 *>(buf), buffer_size));
}
};

8
libraries/libstratosphere/source/erpt/srv/erpt_srv_attachment_impl.cpp
View File

@@ -46,19 +46,19 @@ namespace ams::erpt::srv {
Result AttachmentImpl::Read(ams::sf::Out<u32> out_count, const ams::sf::OutBuffer &out_buffer) {
R_UNLESS(m_attachment != nullptr, erpt::ResultNotInitialized());
return m_attachment->Read(out_count.GetPointer(), static_cast<u8 *>(out_buffer.GetPointer()), static_cast<u32>(out_buffer.GetSize()));
R_RETURN(m_attachment->Read(out_count.GetPointer(), static_cast<u8 *>(out_buffer.GetPointer()), static_cast<u32>(out_buffer.GetSize())));
}
Result AttachmentImpl::SetFlags(AttachmentFlagSet flags) {
R_UNLESS(m_attachment != nullptr, erpt::ResultNotInitialized());
return m_attachment->SetFlags(flags);
R_RETURN(m_attachment->SetFlags(flags));
}
Result AttachmentImpl::GetFlags(ams::sf::Out<AttachmentFlagSet> out) {
R_UNLESS(m_attachment != nullptr, erpt::ResultNotInitialized());
return m_attachment->GetFlags(out.GetPointer());
R_RETURN(m_attachment->GetFlags(out.GetPointer()));
}
Result AttachmentImpl::Close() {
@@ -73,7 +73,7 @@ namespace ams::erpt::srv {
Result AttachmentImpl::GetSize(ams::sf::Out<s64> out) {
R_UNLESS(m_attachment != nullptr, erpt::ResultNotInitialized());
return m_attachment->GetSize(out.GetPointer());
R_RETURN(m_attachment->GetSize(out.GetPointer()));
}
}

22
libraries/libstratosphere/source/erpt/srv/erpt_srv_cipher.hpp
View File

@@ -59,14 +59,14 @@ namespace ams::erpt::srv {
ON_SCOPE_EXIT { std::memset(hdr, 0, sizeof(hdr) + data_size); s_need_to_store_cipher = true; };
return Formatter::AddField(report, field_id, reinterpret_cast<u8 *>(hdr), sizeof(hdr) + data_size);
R_RETURN(Formatter::AddField(report, field_id, reinterpret_cast<u8 *>(hdr), sizeof(hdr) + data_size));
}
public:
static Result Begin(Report *report, u32 record_count) {
s_need_to_store_cipher = false;
crypto::GenerateCryptographicallyRandomBytes(s_key, sizeof(s_key));
return Formatter::Begin(report, record_count + 1);
R_RETURN(Formatter::Begin(report, record_count + 1));
}
static Result End(Report *report) {
@@ -84,40 +84,40 @@ namespace ams::erpt::srv {
Formatter::AddField(report, FieldId_CipherKey, cipher, sizeof(cipher));
std::memset(s_key, 0, sizeof(s_key));
return Formatter::End(report);
R_RETURN(Formatter::End(report));
}
static Result AddField(Report *report, FieldId field_id, bool value) {
return Formatter::AddField(report, field_id, value);
R_RETURN(Formatter::AddField(report, field_id, value));
}
template<typename T>
static Result AddField(Report *report, FieldId field_id, T value) {
return Formatter::AddField<T>(report, field_id, value);
R_RETURN(Formatter::AddField<T>(report, field_id, value));
}
static Result AddField(Report *report, FieldId field_id, char *str, u32 len) {
if (FieldToFlagMap[field_id] == FieldFlag_Encrypt) {
return EncryptArray<char>(report, field_id, str, len);
R_RETURN(EncryptArray<char>(report, field_id, str, len));
} else {
return Formatter::AddField(report, field_id, str, len);
R_RETURN(Formatter::AddField(report, field_id, str, len));
}
}
static Result AddField(Report *report, FieldId field_id, u8 *bin, u32 len) {
if (FieldToFlagMap[field_id] == FieldFlag_Encrypt) {
return EncryptArray<u8>(report, field_id, bin, len);
R_RETURN(EncryptArray<u8>(report, field_id, bin, len));
} else {
return Formatter::AddField(report, field_id, bin, len);
R_RETURN(Formatter::AddField(report, field_id, bin, len));
}
}
template<typename T>
static Result AddField(Report *report, FieldId field_id, T *arr, u32 len) {
if (FieldToFlagMap[field_id] == FieldFlag_Encrypt) {
return EncryptArray<T>(report, field_id, arr, len);
R_RETURN(EncryptArray<T>(report, field_id, arr, len));
} else {
return Formatter::AddField<T>(report, field_id, arr, len);
R_RETURN(Formatter::AddField<T>(report, field_id, arr, len));
}
}
};

6
libraries/libstratosphere/source/erpt/srv/erpt_srv_context.cpp
View File

@@ -100,7 +100,7 @@ namespace ams::erpt::srv {
});
R_UNLESS(it != g_category_list.end(), erpt::ResultCategoryNotFound());
return it->AddContextToCategory(entry, data, data_size);
R_RETURN(it->AddContextToCategory(entry, data, data_size));
}
Result Context::SubmitContextRecord(std::unique_ptr<ContextRecord> record) {
@@ -109,7 +109,7 @@ namespace ams::erpt::srv {
});
R_UNLESS(it != g_category_list.end(), erpt::ResultCategoryNotFound());
return it->AddContextRecordToCategory(std::move(record));
R_RETURN(it->AddContextRecordToCategory(std::move(record)));
}
Result Context::WriteContextsToReport(Report *report) {
@@ -132,7 +132,7 @@ namespace ams::erpt::srv {
R_UNLESS(record != nullptr, erpt::ResultOutOfMemory());
/* Submit the context record. */
return SubmitContextRecord(std::move(record));
R_RETURN(SubmitContextRecord(std::move(record)));
}
}

14
libraries/libstratosphere/source/erpt/srv/erpt_srv_context_impl.cpp
View File

@@ -35,7 +35,7 @@ namespace ams::erpt::srv {
SubmitContextForForcedShutdownDetection(ctx, data, data_size);
return Context::SubmitContext(ctx, data, data_size);
R_RETURN(Context::SubmitContext(ctx, data, data_size));
}
Result ContextImpl::CreateReport(ReportType report_type, const ams::sf::InBuffer &ctx_buffer, const ams::sf::InBuffer &data_buffer, const ams::sf::InBuffer &meta_buffer, Result result) {
@@ -58,7 +58,7 @@ namespace ams::erpt::srv {
}
Result ContextImpl::CreateReportV0(ReportType report_type, const ams::sf::InBuffer &ctx_buffer, const ams::sf::InBuffer &data_buffer, const ams::sf::InBuffer &meta_buffer) {
return this->CreateReport(report_type, ctx_buffer, data_buffer, meta_buffer, ResultSuccess());
R_RETURN(this->CreateReport(report_type, ctx_buffer, data_buffer, meta_buffer, ResultSuccess()));
}
Result ContextImpl::SetInitialLaunchSettingsCompletionTime(const time::SteadyClockTimePoint &time_point) {
@@ -135,7 +135,7 @@ namespace ams::erpt::srv {
char name_safe[AttachmentNameSizeMax];
util::Strlcpy(name_safe, name, sizeof(name_safe));
return JournalForAttachments::SubmitAttachment(out.GetPointer(), name_safe, data, data_size);
R_RETURN(JournalForAttachments::SubmitAttachment(out.GetPointer(), name_safe, data, data_size));
}
Result ContextImpl::CreateReportWithAttachments(ReportType report_type, const ams::sf::InBuffer &ctx_buffer, const ams::sf::InBuffer &data_buffer, const ams::sf::InBuffer &attachment_ids_buffer, Result result) {
@@ -158,19 +158,19 @@ namespace ams::erpt::srv {
}
Result ContextImpl::CreateReportWithAttachmentsDeprecated(ReportType report_type, const ams::sf::InBuffer &ctx_buffer, const ams::sf::InBuffer &data_buffer, const ams::sf::InBuffer &attachment_ids_buffer) {
return this->CreateReportWithAttachments(report_type, ctx_buffer, data_buffer, attachment_ids_buffer, ResultSuccess());
R_RETURN(this->CreateReportWithAttachments(report_type, ctx_buffer, data_buffer, attachment_ids_buffer, ResultSuccess()));
}
Result ContextImpl::RegisterRunningApplet(ncm::ProgramId program_id) {
return Reporter::RegisterRunningApplet(program_id);
R_RETURN(Reporter::RegisterRunningApplet(program_id));
}
Result ContextImpl::UnregisterRunningApplet(ncm::ProgramId program_id) {
return Reporter::UnregisterRunningApplet(program_id);
R_RETURN(Reporter::UnregisterRunningApplet(program_id));
}
Result ContextImpl::UpdateAppletSuspendedDuration(ncm::ProgramId program_id, TimeSpanType duration) {
return Reporter::UpdateAppletSuspendedDuration(program_id, duration);
R_RETURN(Reporter::UpdateAppletSuspendedDuration(program_id, duration));
}
Result ContextImpl::InvalidateForcedShutdownDetection() {

4
libraries/libstratosphere/source/erpt/srv/erpt_srv_context_record.cpp
View File

@@ -202,11 +202,11 @@ namespace ams::erpt::srv {
}
Result ContextRecord::Add(FieldId field_id, const char *str, u32 str_size) {
return this->Add(field_id, str, str_size, FieldType_String);
R_RETURN(this->Add(field_id, str, str_size, FieldType_String));
}
Result ContextRecord::Add(FieldId field_id, const u8 *data, u32 size) {
return this->Add(field_id, data, size, FieldType_U8Array);
R_RETURN(this->Add(field_id, data, size, FieldType_U8Array));
}
}

4
libraries/libstratosphere/source/erpt/srv/erpt_srv_formatter.hpp
View File

@@ -138,12 +138,12 @@ namespace ams::erpt::srv {
template<typename T>
static Result AddField(Report *report, FieldId field_id, T value) {
return AddIdValuePair<T>(report, field_id, value);
R_RETURN(AddIdValuePair<T>(report, field_id, value));
}
template<typename T>
static Result AddField(Report *report, FieldId field_id, T *arr, u32 arr_size) {
return AddIdValueArray(report, field_id, arr, arr_size);
R_RETURN(AddIdValueArray(report, field_id, arr, arr_size));
}
static Result AddField(Report *report, FieldId field_id, bool value) {

10
libraries/libstratosphere/source/erpt/srv/erpt_srv_journal.cpp
View File

@@ -48,11 +48,11 @@ namespace ams::erpt::srv {
}
Result Journal::Delete(ReportId report_id) {
return JournalForReports::DeleteReport(report_id);
R_RETURN(JournalForReports::DeleteReport(report_id));
}
Result Journal::GetAttachmentList(AttachmentList *out, ReportId report_id) {
return JournalForAttachments::GetAttachmentList(out, report_id);
R_RETURN(JournalForAttachments::GetAttachmentList(out, report_id));
}
util::Uuid Journal::GetJournalId() {
@@ -64,7 +64,7 @@ namespace ams::erpt::srv {
}
Result Journal::GetReportList(ReportList *out, ReportType type_filter) {
return JournalForReports::GetReportList(out, type_filter);
R_RETURN(JournalForReports::GetReportList(out, type_filter));
}
u32 Journal::GetStoredReportCount(ReportType type) {
@@ -109,11 +109,11 @@ namespace ams::erpt::srv {
}
Result Journal::Store(JournalRecord<ReportInfo> *record) {
return JournalForReports::StoreRecord(record);
R_RETURN(JournalForReports::StoreRecord(record));
}
Result Journal::Store(JournalRecord<AttachmentInfo> *record) {
return JournalForAttachments::StoreRecord(record);
R_RETURN(JournalForAttachments::StoreRecord(record));
}
}

2
libraries/libstratosphere/source/erpt/srv/erpt_srv_journal_for_meta.cpp
View File

@@ -27,7 +27,7 @@ namespace ams::erpt::srv {
}
Result JournalForMeta::CommitJournal(Stream *stream) {
return stream->WriteStream(reinterpret_cast<const u8 *>(std::addressof(s_journal_meta)), sizeof(s_journal_meta));
R_RETURN(stream->WriteStream(reinterpret_cast<const u8 *>(std::addressof(s_journal_meta)), sizeof(s_journal_meta)));
}
Result JournalForMeta::RestoreJournal(Stream *stream) {

4
libraries/libstratosphere/source/erpt/srv/erpt_srv_main.cpp
View File

@@ -123,11 +123,11 @@ namespace ams::erpt::srv {
/* NOTE: Nintendo does not check error code here. */
InitializeForcedShutdownDetection();
return InitializeService();
R_RETURN(InitializeService());
}
Result SetSerialNumberAndOsVersion(const char *sn, u32 sn_len, const char *os, u32 os_len, const char *os_priv, u32 os_priv_len) {
return Reporter::SetSerialNumberAndOsVersion(sn, sn_len, os, os_len, os_priv, os_priv_len);
R_RETURN(Reporter::SetSerialNumberAndOsVersion(sn, sn_len, os, os_len, os_priv, os_priv_len));
}
Result SetProductModel(const char *model, u32 model_len) {

8
libraries/libstratosphere/source/erpt/srv/erpt_srv_manager_impl.cpp
View File

@@ -49,7 +49,7 @@ namespace ams::erpt::srv {
Result ManagerImpl::GetReportList(const ams::sf::OutBuffer &out_list, ReportType type_filter) {
R_UNLESS(out_list.GetSize() == sizeof(ReportList), erpt::ResultInvalidArgument());
return Journal::GetReportList(reinterpret_cast<ReportList *>(out_list.GetPointer()), type_filter);
R_RETURN(Journal::GetReportList(reinterpret_cast<ReportList *>(out_list.GetPointer()), type_filter));
}
Result ManagerImpl::GetEvent(ams::sf::OutCopyHandle out) {
@@ -60,12 +60,12 @@ namespace ams::erpt::srv {
Result ManagerImpl::CleanupReports() {
Journal::CleanupReports();
Journal::CleanupAttachments();
return Journal::Commit();
R_RETURN(Journal::Commit());
}
Result ManagerImpl::DeleteReport(const ReportId &report_id) {
R_TRY(Journal::Delete(report_id));
return Journal::Commit();
R_RETURN(Journal::Commit());
}
Result ManagerImpl::GetStorageUsageStatistics(ams::sf::Out<StorageUsageStatistics> out) {
@@ -89,7 +89,7 @@ namespace ams::erpt::srv {
Result ManagerImpl::GetAttachmentList(const ams::sf::OutBuffer &out_list, const ReportId &report_id) {
R_UNLESS(out_list.GetSize() == sizeof(AttachmentList), erpt::ResultInvalidArgument());
return Journal::GetAttachmentList(reinterpret_cast<AttachmentList *>(out_list.GetPointer()), report_id);
R_RETURN(Journal::GetAttachmentList(reinterpret_cast<AttachmentList *>(out_list.GetPointer()), report_id));
}
}

12
libraries/libstratosphere/source/erpt/srv/erpt_srv_report.cpp
View File

@@ -52,18 +52,18 @@ namespace ams::erpt::srv {
Result Report::Open(ReportOpenType type) {
switch (type) {
case ReportOpenType_Create: return this->OpenStream(this->FileName().name, StreamMode_Write, ReportStreamBufferSize);
case ReportOpenType_Read: return this->OpenStream(this->FileName().name, StreamMode_Read, ReportStreamBufferSize);
case ReportOpenType_Create: R_RETURN(this->OpenStream(this->FileName().name, StreamMode_Write, ReportStreamBufferSize));
case ReportOpenType_Read: R_RETURN(this->OpenStream(this->FileName().name, StreamMode_Read, ReportStreamBufferSize));
default: R_THROW(erpt::ResultInvalidArgument());
}
}
Result Report::Read(u32 *out_read_count, u8 *dst, u32 dst_size) {
return this->ReadStream(out_read_count, dst, dst_size);
R_RETURN(this->ReadStream(out_read_count, dst, dst_size));
}
Result Report::Delete() {
return this->DeleteStream(this->FileName().name);
R_RETURN(this->DeleteStream(this->FileName().name));
}
void Report::Close() {
@@ -78,13 +78,13 @@ namespace ams::erpt::srv {
Result Report::SetFlags(ReportFlagSet flags) {
if (((~m_record->m_info.flags) & flags).IsAnySet()) {
m_record->m_info.flags |= flags;
return Journal::Commit();
R_RETURN(Journal::Commit());
}
R_SUCCEED();
}
Result Report::GetSize(s64 *out) const {
return this->GetStreamSize(out);
R_RETURN(this->GetStreamSize(out));
}
}

4
libraries/libstratosphere/source/erpt/srv/erpt_srv_report.hpp
View File

@@ -51,12 +51,12 @@ namespace ams::erpt::srv {
template<typename T>
Result Write(T val) {
return this->WriteStream(reinterpret_cast<const u8 *>(std::addressof(val)), sizeof(val));
R_RETURN(this->WriteStream(reinterpret_cast<const u8 *>(std::addressof(val)), sizeof(val)));
}
template<typename T>
Result Write(const T *buf, u32 buffer_size) {
return this->WriteStream(reinterpret_cast<const u8 *>(buf), buffer_size);
R_RETURN(this->WriteStream(reinterpret_cast<const u8 *>(buf), buffer_size));
}
};

8
libraries/libstratosphere/source/erpt/srv/erpt_srv_report_impl.cpp
View File

@@ -46,19 +46,19 @@ namespace ams::erpt::srv {
Result ReportImpl::Read(ams::sf::Out<u32> out_count, const ams::sf::OutBuffer &out_buffer) {
R_UNLESS(m_report != nullptr, erpt::ResultNotInitialized());
return m_report->Read(out_count.GetPointer(), static_cast<u8 *>(out_buffer.GetPointer()), static_cast<u32>(out_buffer.GetSize()));
R_RETURN(m_report->Read(out_count.GetPointer(), static_cast<u8 *>(out_buffer.GetPointer()), static_cast<u32>(out_buffer.GetSize())));
}
Result ReportImpl::SetFlags(ReportFlagSet flags) {
R_UNLESS(m_report != nullptr, erpt::ResultNotInitialized());
return m_report->SetFlags(flags);
R_RETURN(m_report->SetFlags(flags));
}
Result ReportImpl::GetFlags(ams::sf::Out<ReportFlagSet> out) {
R_UNLESS(m_report != nullptr, erpt::ResultNotInitialized());
return m_report->GetFlags(out.GetPointer());
R_RETURN(m_report->GetFlags(out.GetPointer()));
}
Result ReportImpl::Close() {
@@ -73,7 +73,7 @@ namespace ams::erpt::srv {
Result ReportImpl::GetSize(ams::sf::Out<s64> out) {
R_UNLESS(m_report != nullptr, erpt::ResultNotInitialized());
return m_report->GetSize(out.GetPointer());
R_RETURN(m_report->GetSize(out.GetPointer()));
}
}

2
libraries/libstratosphere/source/erpt/srv/erpt_srv_reporter.cpp
View File

@@ -422,7 +422,7 @@ namespace ams::erpt::srv {
R_TRY(record->Initialize(ctx, data, data_size));
/* Create the report. */
return CreateReport(type, ctx_result, std::move(record), meta, attachments, num_attachments);
R_RETURN(CreateReport(type, ctx_result, std::move(record), meta, attachments, num_attachments));
}
Result Reporter::CreateReport(ReportType type, Result ctx_result, std::unique_ptr<ContextRecord> record, const ReportMetaData *meta, const AttachmentId *attachments, u32 num_attachments) {

6
libraries/libstratosphere/source/erpt/srv/erpt_srv_service.cpp
View File

@@ -66,10 +66,10 @@ namespace ams::erpt::srv {
{
auto intf = ams::sf::ObjectFactory<ams::sf::ExpHeapAllocator::Policy>::CreateSharedEmplaced<erpt::sf::ISession, erpt::srv::SessionImpl>(std::addressof(g_sf_allocator));
AMS_ABORT_UNLESS(intf != nullptr);
return this->AcceptImpl(server, intf);
R_RETURN(this->AcceptImpl(server, intf));
}
case PortIndex_Context:
return AcceptImpl(server, m_context_session_object.GetShared());
R_RETURN(AcceptImpl(server, m_context_session_object.GetShared()));
default:
R_THROW(erpt::ResultNotSupported());
}
@@ -144,7 +144,7 @@ namespace ams::erpt::srv {
Result InitializeService() {
util::ConstructAt(g_erpt_server_manager);
return util::GetReference(g_erpt_server_manager).Initialize();
R_RETURN(util::GetReference(g_erpt_server_manager).Initialize());
}
void WaitService() {

6
libraries/libstratosphere/source/erpt/srv/erpt_srv_session_impl.cpp
View File

@@ -39,15 +39,15 @@ namespace ams::erpt::srv {
}
Result SessionImpl::OpenReport(ams::sf::Out<ams::sf::SharedPointer<erpt::sf::IReport>> out) {
return OpenInterface<erpt::sf::IReport, ReportImpl>(out);
R_RETURN((OpenInterface<erpt::sf::IReport, ReportImpl>(out)));
}
Result SessionImpl::OpenManager(ams::sf::Out<ams::sf::SharedPointer<erpt::sf::IManager>> out) {
return OpenInterface<erpt::sf::IManager, ManagerImpl>(out);
R_RETURN((OpenInterface<erpt::sf::IManager, ManagerImpl>(out)));
}
Result SessionImpl::OpenAttachment(ams::sf::Out<ams::sf::SharedPointer<erpt::sf::IAttachment>> out) {
return OpenInterface<erpt::sf::IAttachment, AttachmentImpl>(out);
R_RETURN((OpenInterface<erpt::sf::IAttachment, AttachmentImpl>(out)));
}
}

6
libraries/libstratosphere/source/erpt/srv/erpt_srv_stream.cpp
View File

@@ -28,7 +28,7 @@ namespace ams::erpt::srv {
Result Stream::DeleteStream(const char *path) {
R_UNLESS(s_can_access_fs, erpt::ResultInvalidPowerState());
return fs::DeleteFile(path);
R_RETURN(fs::DeleteFile(path));
}
Result Stream::CommitStream() {
@@ -47,7 +47,7 @@ namespace ams::erpt::srv {
R_TRY(fs::OpenFile(std::addressof(file), path, fs::OpenMode_Read));
ON_SCOPE_EXIT { fs::CloseFile(file); };
return fs::GetFileSize(out, file);
R_RETURN(fs::GetFileSize(out, file));
}
Stream::Stream() : m_buffer_size(0), m_file_position(0), m_buffer_count(0), m_buffer(nullptr), m_stream_mode(StreamMode_Invalid), m_initialized(false) {
@@ -206,7 +206,7 @@ namespace ams::erpt::srv {
}
Result Stream::GetStreamSize(s64 *out) const {
return GetStreamSize(out, m_file_name);
R_RETURN(GetStreamSize(out, m_file_name));
}
Result Stream::Flush() {