mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-06-02 07:39:49 -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

56
exosphere/mariko_fatal/source/fs/fatal_fs_api.cpp
View file

@ -34,45 +34,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());
}
}
@ -125,7 +125,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) {
@ -144,10 +144,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 ReadFile(FileHandle handle, s64 offset, void *buffer, size_t size, const fs::ReadOption &option) {
@ -164,7 +164,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) {
@ -185,7 +185,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) {
@ -195,7 +195,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) {
@ -218,7 +218,7 @@ namespace ams::fs {
R_TRY(FlushFile(handle));
}
return ResultSuccess();
R_SUCCEED();
}
Result SetFileSize(FileHandle handle, s64 size) {
@ -242,7 +242,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) {