From 259a1a7513236a1de4d373bc6cb99032ede2c626 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Fri, 6 Mar 2020 14:25:46 -0800 Subject: [PATCH] fs: improve unsupportedoperation results --- .../stratosphere/fs/fs_memory_storage.hpp | 4 +-- .../include/stratosphere/fs/fs_substorage.hpp | 4 +-- .../source/fs/fs_file_storage.cpp | 2 +- .../source/fs/fs_romfs_filesystem.cpp | 28 +++++++++---------- .../include/vapours/results/fs_results.hpp | 20 ++++++------- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_memory_storage.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_memory_storage.hpp index bc86f0838..b897c535e 100644 --- a/libraries/libstratosphere/include/stratosphere/fs/fs_memory_storage.hpp +++ b/libraries/libstratosphere/include/stratosphere/fs/fs_memory_storage.hpp @@ -63,7 +63,7 @@ namespace ams::fs { } virtual Result SetSize(s64 size) override { - return fs::ResultUnsupportedMemoryStorageSetSize(); + return fs::ResultUnsupportedOperationInMemoryStorageA(); } virtual Result OperateRange(void *dst, size_t dst_size, OperationId op_id, s64 offset, s64 size, const void *src, size_t src_size) override { @@ -76,7 +76,7 @@ namespace ams::fs { reinterpret_cast(dst)->Clear(); return ResultSuccess(); default: - return fs::ResultUnsupportedMemoryStorageOperateRange(); + return fs::ResultUnsupportedOperationInMemoryStorageB(); } } }; diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_substorage.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_substorage.hpp index b6a4f0011..9470b4747 100644 --- a/libraries/libstratosphere/include/stratosphere/fs/fs_substorage.hpp +++ b/libraries/libstratosphere/include/stratosphere/fs/fs_substorage.hpp @@ -103,13 +103,13 @@ namespace ams::fs { virtual Result SetSize(s64 size) override { /* Ensure we're initialized and validate arguments. */ R_UNLESS(this->IsValid(), fs::ResultNotInitialized()); - R_UNLESS(this->resizable, fs::ResultUnsupportedSubStorageSetSizeA()); + R_UNLESS(this->resizable, fs::ResultUnsupportedOperationInSubStorageA()); R_UNLESS(IStorage::IsOffsetAndSizeValid(this->offset, size), fs::ResultInvalidSize()); /* Ensure that we're allowed to set size. */ s64 cur_size; R_TRY(this->base_storage->GetSize(std::addressof(cur_size))); - R_UNLESS(cur_size == this->offset + this->size, fs::ResultUnsupportedSubStorageSetSizeB()); + R_UNLESS(cur_size == this->offset + this->size, fs::ResultUnsupportedOperationInSubStorageB()); /* Set the size. */ R_TRY(this->base_storage->SetSize(this->offset + size)); diff --git a/libraries/libstratosphere/source/fs/fs_file_storage.cpp b/libraries/libstratosphere/source/fs/fs_file_storage.cpp index 0ed8f1338..88105baab 100644 --- a/libraries/libstratosphere/source/fs/fs_file_storage.cpp +++ b/libraries/libstratosphere/source/fs/fs_file_storage.cpp @@ -86,7 +86,7 @@ namespace ams::fs { R_UNLESS(IStorage::IsOffsetAndSizeValid(offset, size), fs::ResultOutOfRange()); return this->base_file->OperateRange(dst, dst_size, op_id, offset, size, src, src_size); default: - return fs::ResultUnsupportedFileStorageOperateRange(); + return fs::ResultUnsupportedOperationInFileStorageA(); } } diff --git a/libraries/libstratosphere/source/fs/fs_romfs_filesystem.cpp b/libraries/libstratosphere/source/fs/fs_romfs_filesystem.cpp index cbbee7514..824145ae8 100644 --- a/libraries/libstratosphere/source/fs/fs_romfs_filesystem.cpp +++ b/libraries/libstratosphere/source/fs/fs_romfs_filesystem.cpp @@ -223,11 +223,11 @@ namespace ams::fs { } virtual Result WriteImpl(s64 offset, const void *buffer, size_t size, const fs::WriteOption &option) override { - return fs::ResultUnsupportedRomFsFileWrite(); + return fs::ResultUnsupportedOperationInRomFsFileA(); } virtual Result SetSizeImpl(s64 size) override { - return fs::ResultUnsupportedRomFsFileWrite(); + return fs::ResultUnsupportedOperationInRomFsFileA(); } virtual Result OperateRangeImpl(void *dst, size_t dst_size, fs::OperationId op_id, s64 offset, s64 size, const void *src, size_t src_size) override { @@ -239,7 +239,7 @@ namespace ams::fs { R_UNLESS(this->GetSize() >= 0, fs::ResultOutOfRange()); } default: - return fs::ResultUnsupportedRomFsFileOperateRange(); + return fs::ResultUnsupportedOperationInRomFsFileB(); } } public: @@ -438,31 +438,31 @@ namespace ams::fs { } Result RomFsFileSystem::CreateFileImpl(const char *path, s64 size, int flags) { - return fs::ResultUnsupportedRomFsFileSystemWrite(); + return fs::ResultUnsupportedOperationInRomFsFileSystemA(); } Result RomFsFileSystem::DeleteFileImpl(const char *path) { - return fs::ResultUnsupportedRomFsFileSystemWrite(); + return fs::ResultUnsupportedOperationInRomFsFileSystemA(); } Result RomFsFileSystem::CreateDirectoryImpl(const char *path) { - return fs::ResultUnsupportedRomFsFileSystemWrite(); + return fs::ResultUnsupportedOperationInRomFsFileSystemA(); } Result RomFsFileSystem::DeleteDirectoryImpl(const char *path) { - return fs::ResultUnsupportedRomFsFileSystemWrite(); + return fs::ResultUnsupportedOperationInRomFsFileSystemA(); } Result RomFsFileSystem::DeleteDirectoryRecursivelyImpl(const char *path) { - return fs::ResultUnsupportedRomFsFileSystemWrite(); + return fs::ResultUnsupportedOperationInRomFsFileSystemA(); } Result RomFsFileSystem::RenameFileImpl(const char *old_path, const char *new_path) { - return fs::ResultUnsupportedRomFsFileSystemWrite(); + return fs::ResultUnsupportedOperationInRomFsFileSystemA(); } Result RomFsFileSystem::RenameDirectoryImpl(const char *old_path, const char *new_path) { - return fs::ResultUnsupportedRomFsFileSystemWrite(); + return fs::ResultUnsupportedOperationInRomFsFileSystemA(); } Result RomFsFileSystem::GetEntryTypeImpl(fs::DirectoryEntryType *out, const char *path) { @@ -519,19 +519,19 @@ namespace ams::fs { } Result RomFsFileSystem::GetFreeSpaceSizeImpl(s64 *out, const char *path) { - return fs::ResultUnsupportedRomFsFileSystemGetSize(); + return fs::ResultUnsupportedOperationInRomFsFileSystemC(); } Result RomFsFileSystem::GetTotalSpaceSizeImpl(s64 *out, const char *path) { - return fs::ResultUnsupportedRomFsFileSystemGetSize(); + return fs::ResultUnsupportedOperationInRomFsFileSystemC(); } Result RomFsFileSystem::CleanDirectoryRecursivelyImpl(const char *path) { - return fs::ResultUnsupportedRomFsFileSystemWrite(); + return fs::ResultUnsupportedOperationInRomFsFileSystemA(); } Result RomFsFileSystem::CommitProvisionallyImpl(s64 counter) { - return fs::ResultUnsupportedRomFsFileSystemCommitProvisionally(); + return fs::ResultUnsupportedOperationInRomFsFileSystemB(); } Result RomFsFileSystem::RollbackImpl() { diff --git a/libraries/libvapours/include/vapours/results/fs_results.hpp b/libraries/libvapours/include/vapours/results/fs_results.hpp index c94ceab7f..9ebbaddd2 100644 --- a/libraries/libvapours/include/vapours/results/fs_results.hpp +++ b/libraries/libvapours/include/vapours/results/fs_results.hpp @@ -232,16 +232,16 @@ namespace ams::fs { R_DEFINE_ERROR_RESULT(FileExtensionWithoutOpenModeAllowAppend, 6201); R_DEFINE_ERROR_RANGE(UnsupportedOperation, 6300, 6399); - R_DEFINE_ERROR_RESULT(UnsupportedSubStorageSetSizeA, 6302); - R_DEFINE_ERROR_RESULT(UnsupportedSubStorageSetSizeB, 6303); - R_DEFINE_ERROR_RESULT(UnsupportedMemoryStorageSetSize, 6304); - R_DEFINE_ERROR_RESULT(UnsupportedMemoryStorageOperateRange, 6305); - R_DEFINE_ERROR_RESULT(UnsupportedFileStorageOperateRange, 6306); - R_DEFINE_ERROR_RESULT(UnsupportedRomFsFileSystemWrite, 6364); - R_DEFINE_ERROR_RESULT(UnsupportedRomFsFileSystemCommitProvisionally, 6365); - R_DEFINE_ERROR_RESULT(UnsupportedRomFsFileSystemGetSize, 6366); - R_DEFINE_ERROR_RESULT(UnsupportedRomFsFileWrite, 6367); - R_DEFINE_ERROR_RESULT(UnsupportedRomFsFileOperateRange, 6368); + R_DEFINE_ERROR_RESULT(UnsupportedOperationInSubStorageA, 6302); + R_DEFINE_ERROR_RESULT(UnsupportedOperationInSubStorageB, 6303); + R_DEFINE_ERROR_RESULT(UnsupportedOperationInMemoryStorageA, 6304); + R_DEFINE_ERROR_RESULT(UnsupportedOperationInMemoryStorageB, 6305); + R_DEFINE_ERROR_RESULT(UnsupportedOperationInFileStorageA, 6306); + R_DEFINE_ERROR_RESULT(UnsupportedOperationInRomFsFileSystemA, 6364); + R_DEFINE_ERROR_RESULT(UnsupportedOperationInRomFsFileSystemB, 6365); + R_DEFINE_ERROR_RESULT(UnsupportedOperationInRomFsFileSystemC, 6366); + R_DEFINE_ERROR_RESULT(UnsupportedOperationInRomFsFileA, 6367); + R_DEFINE_ERROR_RESULT(UnsupportedOperationInRomFsFileB, 6368); R_DEFINE_ERROR_RANGE(PermissionDenied, 6400, 6449);