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

38
libraries/libstratosphere/source/fs/common/fs_dbm_hierarchical_rom_file_table.cpp
View File

@@ -42,7 +42,7 @@ namespace ams::fs {
R_TRY(file_bucket.GetSize(std::addressof(file_bucket_size)));
R_TRY(FileEntryMapTable::Format(file_bucket, FileEntryMapTable::QueryBucketCount(file_bucket_size)));
return ResultSuccess();
R_SUCCEED();
}
HierarchicalRomFileTable::HierarchicalRomFileTable() { /* ... */ }
@@ -56,7 +56,7 @@ namespace ams::fs {
R_TRY(file_bucket.GetSize(std::addressof(file_bucket_size)));
R_TRY(m_file_table.Initialize(file_bucket, FileEntryMapTable::QueryBucketCount(file_bucket_size), file_entry));
return ResultSuccess();
R_SUCCEED();
}
void HierarchicalRomFileTable::Finalize() {
@@ -123,7 +123,7 @@ namespace ams::fs {
}
}
return ResultSuccess();
R_SUCCEED();
}
Result HierarchicalRomFileTable::CreateFile(RomFileId *out, const RomPathChar *path, const FileInfo &info) {
@@ -170,7 +170,7 @@ namespace ams::fs {
}
}
return ResultSuccess();
R_SUCCEED();
}
Result HierarchicalRomFileTable::ConvertPathToDirectoryId(RomDirectoryId *out, const RomPathChar *path) {
@@ -186,7 +186,7 @@ namespace ams::fs {
R_TRY(this->GetDirectoryEntry(std::addressof(pos), std::addressof(entry), key));
*out = PositionToDirectoryId(pos);
return ResultSuccess();
R_SUCCEED();
}
Result HierarchicalRomFileTable::ConvertPathToFileId(RomFileId *out, const RomPathChar *path) {
@@ -202,7 +202,7 @@ namespace ams::fs {
R_TRY(this->GetFileEntry(std::addressof(pos), std::addressof(entry), key));
*out = PositionToFileId(pos);
return ResultSuccess();
R_SUCCEED();
}
Result HierarchicalRomFileTable::GetDirectoryInformation(DirectoryInfo *out, const RomPathChar *path) {
@@ -224,7 +224,7 @@ namespace ams::fs {
AMS_UNUSED(out);
return ResultSuccess();
R_SUCCEED();
}
Result HierarchicalRomFileTable::OpenFile(FileInfo *out, const RomPathChar *path) {
@@ -245,7 +245,7 @@ namespace ams::fs {
R_TRY(this->GetFileEntry(std::addressof(entry), id));
*out = entry.info;
return ResultSuccess();
R_SUCCEED();
}
Result HierarchicalRomFileTable::FindOpen(FindPosition *out, const RomPathChar *path) {
@@ -271,7 +271,7 @@ namespace ams::fs {
out->next_dir = entry.dir;
out->next_file = entry.file;
return ResultSuccess();
R_SUCCEED();
}
Result HierarchicalRomFileTable::FindNextDirectory(RomPathChar *out, FindPosition *find, size_t length) {
@@ -291,7 +291,7 @@ namespace ams::fs {
out[aux_size / sizeof(RomPathChar)] = RomStringTraits::NullTerminator;
find->next_dir = entry.next;
return ResultSuccess();
R_SUCCEED();
}
Result HierarchicalRomFileTable::FindNextFile(RomPathChar *out, FindPosition *find, size_t length) {
@@ -311,7 +311,7 @@ namespace ams::fs {
out[aux_size / sizeof(RomPathChar)] = RomStringTraits::NullTerminator;
find->next_file = entry.next;
return ResultSuccess();
R_SUCCEED();
}
Result HierarchicalRomFileTable::QueryRomFileSystemSize(s64 *out_dir_entry_size, s64 *out_file_entry_size) {
@@ -320,7 +320,7 @@ namespace ams::fs {
*out_dir_entry_size = m_dir_table.GetTotalEntrySize();
*out_file_entry_size = m_file_table.GetTotalEntrySize();
return ResultSuccess();
R_SUCCEED();
}
Result HierarchicalRomFileTable::GetGrandParent(Position *out_pos, EntryKey *out_dir_key, RomDirectoryEntry *out_dir_entry, Position pos, RomPathTool::RomEntryName name, const RomPathChar *path) {
@@ -338,7 +338,7 @@ namespace ams::fs {
R_TRY(this->GetDirectoryEntry(out_pos, out_dir_entry, *out_dir_key));
return ResultSuccess();
R_SUCCEED();
}
Result HierarchicalRomFileTable::FindParentDirectoryRecursive(Position *out_pos, EntryKey *out_dir_key, RomDirectoryEntry *out_dir_entry, RomPathTool::PathParser *parser, const RomPathChar *path) {
@@ -382,7 +382,7 @@ namespace ams::fs {
*out_pos = parent_pos;
*out_dir_key = dir_key;
*out_dir_entry = dir_entry;
return ResultSuccess();
R_SUCCEED();
}
Result HierarchicalRomFileTable::FindPathRecursive(EntryKey *out_key, RomDirectoryEntry *out_dir_entry, bool is_dir, const RomPathChar *path) {
@@ -434,7 +434,7 @@ namespace ams::fs {
R_TRY(parser.GetAsFileName(std::addressof(out_key->name)));
}
return ResultSuccess();
R_SUCCEED();
}
Result HierarchicalRomFileTable::FindDirectoryRecursive(EntryKey *out_key, RomDirectoryEntry *out_dir_entry, const RomPathChar *path) {
@@ -475,7 +475,7 @@ namespace ams::fs {
return if_exists;
}
}
return ResultSuccess();
R_SUCCEED();
}
Result HierarchicalRomFileTable::GetDirectoryEntry(Position *out_pos, RomDirectoryEntry *out_entry, const EntryKey &key) {
@@ -551,7 +551,7 @@ namespace ams::fs {
AMS_UNUSED(out);
return ResultSuccess();
R_SUCCEED();
}
Result HierarchicalRomFileTable::OpenFile(FileInfo *out, const EntryKey &key) {
@@ -562,7 +562,7 @@ namespace ams::fs {
R_TRY(this->GetFileEntry(std::addressof(pos), std::addressof(entry), key));
*out = entry.info;
return ResultSuccess();
R_SUCCEED();
}
Result HierarchicalRomFileTable::FindOpen(FindPosition *out, const EntryKey &key) {
@@ -578,7 +578,7 @@ namespace ams::fs {
out->next_dir = entry.dir;
out->next_file = entry.file;
return ResultSuccess();
R_SUCCEED();
}
}

10
libraries/libstratosphere/source/fs/common/fs_dbm_rom_path_tool.cpp
View File

@@ -32,7 +32,7 @@ namespace ams::fs::RomPathTool {
/* ... */
}
return ResultSuccess();
R_SUCCEED();
}
void PathParser::Finalize() {
@@ -97,7 +97,7 @@ namespace ams::fs::RomPathTool {
}
}
return ResultSuccess();
R_SUCCEED();
}
Result PathParser::GetAsDirectoryName(RomEntryName *out) const {
@@ -111,7 +111,7 @@ namespace ams::fs::RomPathTool {
out->length = len;
out->path = m_prev_path_start;
return ResultSuccess();
R_SUCCEED();
}
Result PathParser::GetAsFileName(RomEntryName *out) const {
@@ -125,7 +125,7 @@ namespace ams::fs::RomPathTool {
out->length = len;
out->path = m_prev_path_start;
return ResultSuccess();
R_SUCCEED();
}
Result GetParentDirectoryName(RomEntryName *out, const RomEntryName &cur, const RomPathChar *p) {
@@ -186,7 +186,7 @@ namespace ams::fs::RomPathTool {
out->length = end - start + 1;
}
return ResultSuccess();
R_SUCCEED();
}
}

8
libraries/libstratosphere/source/fs/common/fs_file_storage.cpp
View File

@@ -62,7 +62,7 @@ namespace ams::fs {
Result FileStorage::GetSize(s64 *out_size) {
R_TRY(this->UpdateSize());
*out_size = m_size;
return ResultSuccess();
R_SUCCEED();
}
Result FileStorage::SetSize(s64 size) {
@@ -100,7 +100,7 @@ namespace ams::fs {
this->SetFile(std::move(base_file));
m_base_file_system = std::move(base_file_system);
return ResultSuccess();
R_SUCCEED();
}
Result FileHandleStorage::UpdateSize() {
@@ -153,7 +153,7 @@ namespace ams::fs {
Result FileHandleStorage::GetSize(s64 *out_size) {
R_TRY(this->UpdateSize());
*out_size = m_size;
return ResultSuccess();
R_SUCCEED();
}
Result FileHandleStorage::SetSize(s64 size) {
@@ -172,7 +172,7 @@ namespace ams::fs {
return QueryRange(static_cast<QueryRangeInfo *>(dst), m_handle, offset, size);
default:
return fs::ResultUnsupportedOperateRangeForFileHandleStorage();
R_THROW(fs::ResultUnsupportedOperateRangeForFileHandleStorage());
}
}