mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-05-21 10:25:08 -04:00
Code Issues Projects Releases Packages 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

64
fusee/program/source/fs/fusee_fs_api.cpp
View file

@ -39,45 +39,45 @@ namespace ams::fs {
Result TranslateFatFsError(FRESULT res) {
switch (res) {
case FR_OK:
return ResultSuccess();
R_SUCCEED();
case FR_DISK_ERR:
return fs::ResultMmcAccessFailed();
R_THROW(fs::ResultMmcAccessFailed());
case FR_INT_ERR:
return fs::ResultPreconditionViolation();
R_THROW(fs::ResultPreconditionViolation());
case FR_NOT_READY:
return fs::ResultMmcAccessFailed();
R_THROW(fs::ResultMmcAccessFailed());
case FR_NO_FILE:
return fs::ResultPathNotFound();
R_THROW(fs::ResultPathNotFound());
case FR_NO_PATH:
return fs::ResultPathNotFound();
R_THROW(fs::ResultPathNotFound());
case FR_INVALID_NAME:
return fs::ResultInvalidPath();
R_THROW(fs::ResultInvalidPath());
case FR_DENIED:
return fs::ResultPermissionDenied();
R_THROW(fs::ResultPermissionDenied());
case FR_EXIST:
return fs::ResultPathAlreadyExists();
R_THROW(fs::ResultPathAlreadyExists());
case FR_INVALID_OBJECT:
return fs::ResultInvalidArgument();
R_THROW(fs::ResultInvalidArgument());
case FR_WRITE_PROTECTED:
return fs::ResultWriteNotPermitted();
R_THROW(fs::ResultWriteNotPermitted());
case FR_INVALID_DRIVE:
return fs::ResultInvalidMountName();
R_THROW(fs::ResultInvalidMountName());
case FR_NOT_ENABLED:
return fs::ResultInvalidMountName(); /* BAD/TODO */
R_THROW(fs::ResultInvalidMountName()); /* BAD/TODO */
case FR_NO_FILESYSTEM:
return fs::ResultInvalidMountName(); /* BAD/TODO */
R_THROW(fs::ResultInvalidMountName()); /* BAD/TODO */
case FR_TIMEOUT:
return fs::ResultTargetLocked(); /* BAD/TODO */
R_THROW(fs::ResultTargetLocked()); /* BAD/TODO */
case FR_LOCKED:
return fs::ResultTargetLocked();
R_THROW(fs::ResultTargetLocked());
case FR_NOT_ENOUGH_CORE:
return fs::ResultPreconditionViolation(); /* BAD/TODO */
R_THROW(fs::ResultPreconditionViolation()); /* BAD/TODO */
case FR_TOO_MANY_OPEN_FILES:
return fs::ResultPreconditionViolation(); /* BAD/TODO */
R_THROW(fs::ResultPreconditionViolation()); /* BAD/TODO */
case FR_INVALID_PARAMETER:
return fs::ResultInvalidArgument();
R_THROW(fs::ResultInvalidArgument());
default:
return fs::ResultInternal();
R_THROW(fs::ResultInternal());
}
}
@ -138,7 +138,7 @@ namespace ams::fs {
*out_entry_type = (info.fattrib & AM_DIR) ? DirectoryEntryType_Directory : DirectoryEntryType_File;
*out_archive = (info.fattrib & AM_ARC);
return ResultSuccess();
R_SUCCEED();
}
Result CreateFile(const char *path, s64 size) {
@ -152,7 +152,7 @@ namespace ams::fs {
/* Expand the file. */
R_TRY(TranslateFatFsError(f_expand(std::addressof(fp), size, 1)));
return ResultSuccess();
R_SUCCEED();
}
Result CreateDirectory(const char *path) {
@ -171,10 +171,10 @@ namespace ams::fs {
out_file->_handle = fp;
g_files_opened[i] = true;
g_open_modes[i] = mode;
return ResultSuccess();
R_SUCCEED();
}
}
return fs::ResultOpenCountLimit();
R_THROW(fs::ResultOpenCountLimit());
}
Result OpenDirectory(DirectoryHandle *out_dir, const char *path) {
@ -188,10 +188,10 @@ namespace ams::fs {
/* Set the output. */
out_dir->_handle = dp;
g_dirs_opened[i] = true;
return ResultSuccess();
R_SUCCEED();
}
}
return fs::ResultOpenCountLimit();
R_THROW(fs::ResultOpenCountLimit());
}
Result ReadDirectory(s64 *out_count, DirectoryEntry *out_entries, DirectoryHandle handle, s64 max_entries) {
@ -209,7 +209,7 @@ namespace ams::fs {
}
*out_count = count;
return ResultSuccess();
R_SUCCEED();
}
void CloseDirectory(DirectoryHandle handle) {
@ -232,7 +232,7 @@ namespace ams::fs {
/* Check that we read the correct amount. */
R_UNLESS(br == size, fs::ResultOutOfRange());
return ResultSuccess();
R_SUCCEED();
}
Result ReadFile(FileHandle handle, s64 offset, void *buffer, size_t size) {
@ -253,7 +253,7 @@ namespace ams::fs {
/* Set the output size. */
*out = br;
return ResultSuccess();
R_SUCCEED();
}
Result ReadFile(size_t *out, FileHandle handle, s64 offset, void *buffer, size_t size) {
@ -263,7 +263,7 @@ namespace ams::fs {
Result GetFileSize(s64 *out, FileHandle handle) {
FIL *fp = GetInternalFile(handle);
*out = f_size(fp);
return ResultSuccess();
R_SUCCEED();
}
Result FlushFile(FileHandle handle) {
@ -286,7 +286,7 @@ namespace ams::fs {
R_TRY(FlushFile(handle));
}
return ResultSuccess();
R_SUCCEED();
}
Result SetFileSize(FileHandle handle, s64 size) {
@ -310,7 +310,7 @@ namespace ams::fs {
/* Check that our expansion succeeded. */
AMS_ASSERT(f_size(fp) == static_cast<FSIZE_t>(size));
return ResultSuccess();
R_SUCCEED();
}
int GetFileOpenMode(FileHandle handle) {

2
fusee/program/source/fs/fusee_fs_file_storage.cpp
View file

@ -62,7 +62,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) {

8
fusee/program/source/fs/fusee_fs_storage.hpp
View file

@ -85,11 +85,11 @@ namespace ams::fs {
}
virtual Result Write(s64 offset, const void *buffer, size_t size) override {
return fs::ResultUnsupportedOperation();
R_THROW(fs::ResultUnsupportedOperation());
}
virtual Result SetSize(s64 size) override {
return fs::ResultUnsupportedOperation();
R_THROW(fs::ResultUnsupportedOperation());
}
};
@ -127,11 +127,11 @@ namespace ams::fs {
virtual Result GetSize(s64 *out) override {
*out = m_size;
return ResultSuccess();
R_SUCCEED();
}
virtual Result SetSize(s64 size) override {
return fs::ResultUnsupportedSetSizeForNotResizableSubStorage();
R_THROW(fs::ResultUnsupportedSetSizeForNotResizableSubStorage());
}
};

26
fusee/program/source/fusee_emummc.cpp
View file

@ -37,7 +37,7 @@ namespace ams::nxboot {
}
virtual Result Flush() override {
return ResultSuccess();
R_SUCCEED();
}
virtual Result GetSize(s64 *out) override {
@ -45,15 +45,15 @@ namespace ams::nxboot {
R_TRY(GetSdCardMemoryCapacity(std::addressof(num_sectors)));
*out = static_cast<s64>(num_sectors) * static_cast<s64>(sdmmc::SectorSize);
return ResultSuccess();
R_SUCCEED();
}
virtual Result Write(s64 offset, const void *buffer, size_t size) override {
return fs::ResultUnsupportedOperation();
R_THROW(fs::ResultUnsupportedOperation());
}
virtual Result SetSize(s64 size) override {
return fs::ResultUnsupportedOperation();
R_THROW(fs::ResultUnsupportedOperation());
}
};
@ -71,7 +71,7 @@ namespace ams::nxboot {
}
virtual Result Flush() override {
return ResultSuccess();
R_SUCCEED();
}
virtual Result GetSize(s64 *out) override {
@ -79,15 +79,15 @@ namespace ams::nxboot {
R_TRY(GetMmcMemoryCapacity(std::addressof(num_sectors), Partition));
*out = num_sectors * sdmmc::SectorSize;
return ResultSuccess();
R_SUCCEED();
}
virtual Result Write(s64 offset, const void *buffer, size_t size) override {
return fs::ResultUnsupportedOperation();
R_THROW(fs::ResultUnsupportedOperation());
}
virtual Result SetSize(s64 size) override {
return fs::ResultUnsupportedOperation();
R_THROW(fs::ResultUnsupportedOperation());
}
};
@ -153,23 +153,23 @@ namespace ams::nxboot {
subofs = 0;
}
return ResultSuccess();
R_SUCCEED();
}
virtual Result Flush() override {
return fs::ResultUnsupportedOperation();
R_THROW(fs::ResultUnsupportedOperation());
}
virtual Result GetSize(s64 *out) override {
return fs::ResultUnsupportedOperation();
R_THROW(fs::ResultUnsupportedOperation());
}
virtual Result Write(s64 offset, const void *buffer, size_t size) override {
return fs::ResultUnsupportedOperation();
R_THROW(fs::ResultUnsupportedOperation());
}
virtual Result SetSize(s64 size) override {
return fs::ResultUnsupportedOperation();
R_THROW(fs::ResultUnsupportedOperation());
}
};

2
fusee/program/source/fusee_fatal.cpp
View file

@ -45,7 +45,7 @@ namespace ams::nxboot {
/* Write the context to the file. */
R_TRY(fs::WriteFile(file, 0, ctx, sizeof(*ctx), fs::WriteOption::Flush));
return ResultSuccess();
R_SUCCEED();
}
}

2
fusee/program/source/fusee_mmc.cpp
View file

@ -34,7 +34,7 @@ namespace ams::nxboot {
g_mmc_partition = partition;
}
return ResultSuccess();
R_SUCCEED();
}
}