ams: use R_SUCCEED, R_THROW globally
This commit is contained in:
@@ -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());
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user