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

24
libraries/libstratosphere/include/stratosphere/fs/common/fs_dbm_rom_key_value_storage.hpp
View File

@@ -67,7 +67,7 @@ namespace ams::fs {
for (s64 i = 0; i < count; i++) {
R_TRY(bucket.Write(i * sizeof(pos), std::addressof(pos), sizeof(pos)));
}
return ResultSuccess();
R_SUCCEED();
}
public:
KeyValueRomStorageTemplate() : m_bucket_count(), m_bucket_storage(), m_kv_storage(), m_total_entry_size(), m_entry_count() { /* ... */ }
@@ -77,7 +77,7 @@ namespace ams::fs {
m_bucket_storage = bucket;
m_bucket_count = count;
m_kv_storage = kv;
return ResultSuccess();
R_SUCCEED();
}
void Finalize() {
@@ -95,7 +95,7 @@ namespace ams::fs {
s64 kv_size = 0;
R_TRY(m_kv_storage.GetSize(std::addressof(kv_size)));
*out = kv_size - m_total_entry_size;
return ResultSuccess();
R_SUCCEED();
}
constexpr u32 GetEntryCount() const {
@@ -128,7 +128,7 @@ namespace ams::fs {
*out = pos;
m_entry_count++;
return ResultSuccess();
R_SUCCEED();
}
Result GetInternal(Position *out_pos, Value *out_val, const Key &key, u32 hash_key, const void *aux, size_t aux_size) {
@@ -142,7 +142,7 @@ namespace ams::fs {
*out_pos = pos;
*out_val = elem.value;
return ResultSuccess();
R_SUCCEED();
}
Result GetByPosition(Key *out_key, Value *out_val, Position pos) {
@@ -154,7 +154,7 @@ namespace ams::fs {
*out_key = elem.key;
*out_val = elem.value;
return ResultSuccess();
R_SUCCEED();
}
Result GetByPosition(Key *out_key, Value *out_val, void *out_aux, size_t *out_aux_size, Position pos) {
@@ -168,7 +168,7 @@ namespace ams::fs {
*out_key = elem.key;
*out_val = elem.value;
return ResultSuccess();
R_SUCCEED();
}
Result SetByPosition(Position pos, const Value &value) {
@@ -213,7 +213,7 @@ namespace ams::fs {
if (key.IsEqual(out_elem->key, aux, aux_size, buf, cur_aux_size)) {
*out_pos = cur;
return ResultSuccess();
R_SUCCEED();
}
*out_prev = cur;
@@ -233,7 +233,7 @@ namespace ams::fs {
*out = static_cast<Position>(m_total_entry_size);
m_total_entry_size = util::AlignUp(static_cast<s64>(end_pos), alignof(Position));
return ResultSuccess();
R_SUCCEED();
}
Result LinkEntry(Position *out, Position pos, u32 hash_key) {
@@ -251,7 +251,7 @@ namespace ams::fs {
R_TRY(this->WriteBucket(pos, ind));
*out = next;
return ResultSuccess();
R_SUCCEED();
}
Result ReadBucket(Position *out, BucketIndex ind) {
@@ -291,7 +291,7 @@ namespace ams::fs {
R_TRY(m_kv_storage.Read(pos + sizeof(*out), out_aux, out->size));
}
return ResultSuccess();
R_SUCCEED();
}
Result WriteKeyValue(const Element *elem, Position pos, const void *aux, size_t aux_size) {
@@ -308,7 +308,7 @@ namespace ams::fs {
R_TRY(m_kv_storage.Write(pos + sizeof(*elem), aux, aux_size));
}
return ResultSuccess();
R_SUCCEED();
}
};

4
libraries/libstratosphere/include/stratosphere/fs/fs_istorage.hpp
View File

@@ -113,13 +113,13 @@ namespace ams::fs {
virtual Result Write(s64 offset, const void *buffer, size_t size) override {
/* TODO: Better result? Is it possible to get a more specific one? */
AMS_UNUSED(offset, buffer, size);
return fs::ResultUnsupportedOperation();
R_THROW(fs::ResultUnsupportedOperation());
}
virtual Result SetSize(s64 size) override {
/* TODO: Better result? Is it possible to get a more specific one? */
AMS_UNUSED(size);
return fs::ResultUnsupportedOperation();
R_THROW(fs::ResultUnsupportedOperation());
}
};

16
libraries/libstratosphere/include/stratosphere/fs/fs_memory_storage.hpp
View File

@@ -38,7 +38,7 @@ namespace ams::fs {
/* Copy from memory. */
std::memcpy(buffer, m_buf + offset, size);
return ResultSuccess();
R_SUCCEED();
}
virtual Result Write(s64 offset, const void *buffer, size_t size) override {
@@ -51,21 +51,21 @@ namespace ams::fs {
/* Copy to memory. */
std::memcpy(m_buf + offset, buffer, size);
return ResultSuccess();
R_SUCCEED();
}
virtual Result Flush() override {
return ResultSuccess();
R_SUCCEED();
}
virtual Result GetSize(s64 *out) override {
*out = m_size;
return ResultSuccess();
R_SUCCEED();
}
virtual Result SetSize(s64 size) override {
AMS_UNUSED(size);
return fs::ResultUnsupportedSetSizeForMemoryStorage();
R_THROW(fs::ResultUnsupportedSetSizeForMemoryStorage());
}
virtual Result OperateRange(void *dst, size_t dst_size, OperationId op_id, s64 offset, s64 size, const void *src, size_t src_size) override {
@@ -73,14 +73,14 @@ namespace ams::fs {
switch (op_id) {
case OperationId::Invalidate:
return ResultSuccess();
R_SUCCEED();
case OperationId::QueryRange:
R_UNLESS(dst != nullptr, fs::ResultNullptrArgument());
R_UNLESS(dst_size == sizeof(QueryRangeInfo), fs::ResultInvalidSize());
reinterpret_cast<QueryRangeInfo *>(dst)->Clear();
return ResultSuccess();
R_SUCCEED();
default:
return fs::ResultUnsupportedOperateRangeForMemoryStorage();
R_THROW(fs::ResultUnsupportedOperateRangeForMemoryStorage());
}
}
};

34
libraries/libstratosphere/include/stratosphere/fs/fs_read_only_filesystem.hpp
View File

@@ -44,7 +44,7 @@ namespace ams::fs {
}
virtual Result DoFlush() override final {
return ResultSuccess();
R_SUCCEED();
}
virtual Result DoWrite(s64 offset, const void *buffer, size_t size, const fs::WriteOption &option) override final {
@@ -54,12 +54,12 @@ namespace ams::fs {
AMS_ASSERT(!need_append);
AMS_UNUSED(buffer);
return fs::ResultUnsupportedWriteForReadOnlyFile();
R_THROW(fs::ResultUnsupportedWriteForReadOnlyFile());
}
virtual Result DoSetSize(s64 size) override final {
R_TRY(this->DrySetSize(size, fs::OpenMode_Read));
return fs::ResultUnsupportedWriteForReadOnlyFile();
R_THROW(fs::ResultUnsupportedWriteForReadOnlyFile());
}
virtual Result DoOperateRange(void *dst, size_t dst_size, fs::OperationId op_id, s64 offset, s64 size, const void *src, size_t src_size) override final {
@@ -68,7 +68,7 @@ namespace ams::fs {
case OperationId::QueryRange:
return m_base_file->OperateRange(dst, dst_size, op_id, offset, size, src, src_size);
default:
return fs::ResultUnsupportedOperateRangeForReadOnlyFile();
R_THROW(fs::ResultUnsupportedOperateRangeForReadOnlyFile());
}
}
public:
@@ -100,7 +100,7 @@ namespace ams::fs {
R_UNLESS(read_only_file != nullptr, fs::ResultAllocationMemoryFailedInReadOnlyFileSystemA());
*out_file = std::move(read_only_file);
return ResultSuccess();
R_SUCCEED();
}
virtual Result DoOpenDirectory(std::unique_ptr<fsa::IDirectory> *out_dir, const fs::Path &path, OpenDirectoryMode mode) override final {
@@ -112,62 +112,62 @@ namespace ams::fs {
}
virtual Result DoCommit() override final {
return ResultSuccess();
R_SUCCEED();
}
virtual Result DoCreateFile(const fs::Path &path, s64 size, int flags) override final {
AMS_UNUSED(path, size, flags);
return fs::ResultUnsupportedWriteForReadOnlyFileSystem();
R_THROW(fs::ResultUnsupportedWriteForReadOnlyFileSystem());
}
virtual Result DoDeleteFile(const fs::Path &path) override final {
AMS_UNUSED(path);
return fs::ResultUnsupportedWriteForReadOnlyFileSystem();
R_THROW(fs::ResultUnsupportedWriteForReadOnlyFileSystem());
}
virtual Result DoCreateDirectory(const fs::Path &path) override final {
AMS_UNUSED(path);
return fs::ResultUnsupportedWriteForReadOnlyFileSystem();
R_THROW(fs::ResultUnsupportedWriteForReadOnlyFileSystem());
}
virtual Result DoDeleteDirectory(const fs::Path &path) override final {
AMS_UNUSED(path);
return fs::ResultUnsupportedWriteForReadOnlyFileSystem();
R_THROW(fs::ResultUnsupportedWriteForReadOnlyFileSystem());
}
virtual Result DoDeleteDirectoryRecursively(const fs::Path &path) override final {
AMS_UNUSED(path);
return fs::ResultUnsupportedWriteForReadOnlyFileSystem();
R_THROW(fs::ResultUnsupportedWriteForReadOnlyFileSystem());
}
virtual Result DoRenameFile(const fs::Path &old_path, const fs::Path &new_path) override final {
AMS_UNUSED(old_path, new_path);
return fs::ResultUnsupportedWriteForReadOnlyFileSystem();
R_THROW(fs::ResultUnsupportedWriteForReadOnlyFileSystem());
}
virtual Result DoRenameDirectory(const fs::Path &old_path, const fs::Path &new_path) override final {
AMS_UNUSED(old_path, new_path);
return fs::ResultUnsupportedWriteForReadOnlyFileSystem();
R_THROW(fs::ResultUnsupportedWriteForReadOnlyFileSystem());
}
virtual Result DoCleanDirectoryRecursively(const fs::Path &path) override final {
AMS_UNUSED(path);
return fs::ResultUnsupportedWriteForReadOnlyFileSystem();
R_THROW(fs::ResultUnsupportedWriteForReadOnlyFileSystem());
}
virtual Result DoGetFreeSpaceSize(s64 *out, const fs::Path &path) override final {
AMS_UNUSED(out, path);
return fs::ResultUnsupportedCommitProvisionallyForReadOnlyFileSystem();
R_THROW(fs::ResultUnsupportedCommitProvisionallyForReadOnlyFileSystem());
}
virtual Result DoGetTotalSpaceSize(s64 *out, const fs::Path &path) override final {
AMS_UNUSED(out, path);
return fs::ResultUnsupportedCommitProvisionallyForReadOnlyFileSystem();
R_THROW(fs::ResultUnsupportedCommitProvisionallyForReadOnlyFileSystem());
}
virtual Result DoCommitProvisionally(s64 counter) override final {
AMS_UNUSED(counter);
return fs::ResultUnsupportedGetTotalSpaceSizeForReadOnlyFileSystem();
R_THROW(fs::ResultUnsupportedGetTotalSpaceSizeForReadOnlyFileSystem());
}
};

4
libraries/libstratosphere/include/stratosphere/fs/fs_remote_filesystem.hpp
View File

@@ -181,7 +181,7 @@ namespace ams::fs {
R_UNLESS(file != nullptr, fs::ResultAllocationMemoryFailedNew());
*out_file = std::move(file);
return ResultSuccess();
R_SUCCEED();
}
virtual Result DoOpenDirectory(std::unique_ptr<fsa::IDirectory> *out_dir, const fs::Path &path, OpenDirectoryMode mode) override final {
@@ -195,7 +195,7 @@ namespace ams::fs {
R_UNLESS(dir != nullptr, fs::ResultAllocationMemoryFailedNew());
*out_dir = std::move(dir);
return ResultSuccess();
R_SUCCEED();
}
virtual Result DoCommit() override final {

2
libraries/libstratosphere/include/stratosphere/fs/fs_remote_storage.hpp
View File

@@ -54,7 +54,7 @@ namespace ams::fs {
virtual Result OperateRange(void *dst, size_t dst_size, OperationId op_id, s64 offset, s64 size, const void *src, size_t src_size) override {
/* TODO: How to deal with this? */
AMS_UNUSED(dst, dst_size, op_id, offset, size, src, src_size);
return fs::ResultUnsupportedOperation();
R_THROW(fs::ResultUnsupportedOperation());
};
};
#endif

4
libraries/libstratosphere/include/stratosphere/fs/fs_substorage.hpp
View File

@@ -121,7 +121,7 @@ namespace ams::fs {
R_TRY(m_base_storage->SetSize(m_offset + size));
m_size = size;
return ResultSuccess();
R_SUCCEED();
}
virtual Result GetSize(s64 *out) override {
@@ -129,7 +129,7 @@ namespace ams::fs {
R_UNLESS(this->IsValid(), fs::ResultNotInitialized());
*out = m_size;
return ResultSuccess();
R_SUCCEED();
}
virtual Result OperateRange(void *dst, size_t dst_size, OperationId op_id, s64 offset, s64 size, const void *src, size_t src_size) override {

2
libraries/libstratosphere/include/stratosphere/fs/fsa/fs_idirectory.hpp
View File

@@ -29,7 +29,7 @@ namespace ams::fs::fsa {
R_UNLESS(out_count != nullptr, fs::ResultNullptrArgument());
if (max_entries == 0) {
*out_count = 0;
return ResultSuccess();
R_SUCCEED();
}
R_UNLESS(out_entries != nullptr, fs::ResultNullptrArgument());
R_UNLESS(max_entries > 0, fs::ResultInvalidArgument());

8
libraries/libstratosphere/include/stratosphere/fs/impl/fs_priority_utils.hpp
View File

@@ -44,10 +44,10 @@ namespace ams::fs::impl {
case PriorityRaw_Realtime: *out = TlsIoPriority_Realtime; break;
case PriorityRaw_Low: *out = TlsIoPriority_Low; break;
case PriorityRaw_Background: *out = TlsIoPriority_Background; break;
default: return fs::ResultInvalidArgument();
default: R_THROW(fs::ResultInvalidArgument());
}
return ResultSuccess();
R_SUCCEED();
}
constexpr inline Result ConvertTlsIoPriorityToFsPriority(PriorityRaw *out, u8 tls_io) {
@@ -58,10 +58,10 @@ namespace ams::fs::impl {
case TlsIoPriority_Realtime: *out = PriorityRaw_Realtime; break;
case TlsIoPriority_Low: *out = PriorityRaw_Low; break;
case TlsIoPriority_Background: *out = PriorityRaw_Background; break;
default: return fs::ResultInvalidArgument();
default: R_THROW(fs::ResultInvalidArgument());
}
return ResultSuccess();
R_SUCCEED();
}
inline u8 GetTlsIoPriority(os::ThreadType *thread) {