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

8
stratosphere/ams_mitm/source/sysupdater/sysupdater_apply_manager.cpp
View File

@@ -33,7 +33,7 @@ namespace ams::mitm::sysupdater {
R_TRY(updater::MarkVerifyingRequired(updater::BootModeType::Safe, g_boot_image_update_buffer, sizeof(g_boot_image_update_buffer)));
/* Pre-commit is now marked. */
return ResultSuccess();
R_SUCCEED();
}
Result UpdateBootImages() {
@@ -59,7 +59,7 @@ namespace ams::mitm::sysupdater {
R_TRY(updater::MarkVerified(boot_mode, g_boot_image_update_buffer, sizeof(g_boot_image_update_buffer)));
/* The boot images are updated. */
return ResultSuccess();
R_SUCCEED();
};
/* Get the boot image update type. */
@@ -72,7 +72,7 @@ namespace ams::mitm::sysupdater {
R_TRY(UpdateBootImageImpl(updater::BootModeType::Normal, boot_image_update_type));
/* Both sets of images are updated. */
return ResultSuccess();
R_SUCCEED();
}
}
@@ -92,7 +92,7 @@ namespace ams::mitm::sysupdater {
/* Update the boot images. */
R_TRY(UpdateBootImages());
return ResultSuccess();
R_SUCCEED();
}
}

4
stratosphere/ams_mitm/source/sysupdater/sysupdater_async_impl.cpp
View File

@@ -25,7 +25,7 @@ namespace ams::mitm::sysupdater {
R_CONVERT(ncm::ResultInstallTaskCancelled, ns::ResultCanceled());
} R_END_TRY_CATCH;
return ResultSuccess();
R_SUCCEED();
}
AsyncPrepareSdCardUpdateImpl::~AsyncPrepareSdCardUpdateImpl() {
@@ -66,7 +66,7 @@ namespace ams::mitm::sysupdater {
/* Set our thread info. */
m_thread_info = info;
return ResultSuccess();
R_SUCCEED();
}
Result AsyncPrepareSdCardUpdateImpl::Execute() {

12
stratosphere/ams_mitm/source/sysupdater/sysupdater_async_impl.hpp
View File

@@ -34,13 +34,13 @@ namespace ams::mitm::sysupdater {
return result;
}
return ResultSuccess();
R_SUCCEED();
}
template<typename T>
Result GetAndSaveErrorContext(T &async) {
R_TRY(this->SaveErrorContextIfFailed(async, async.Get()));
return ResultSuccess();
R_SUCCEED();
}
template<typename T>
@@ -50,7 +50,7 @@ namespace ams::mitm::sysupdater {
return result;
}
return ResultSuccess();
R_SUCCEED();
}
const err::ErrorContext &GetErrorContextImpl() {
@@ -66,12 +66,12 @@ namespace ams::mitm::sysupdater {
Result Cancel() {
this->CancelImpl();
return ResultSuccess();
R_SUCCEED();
}
virtual Result GetErrorContext(sf::Out<err::ErrorContext> out) {
*out = {};
return ResultSuccess();
R_SUCCEED();
}
private:
virtual void CancelImpl() = 0;
@@ -105,7 +105,7 @@ namespace ams::mitm::sysupdater {
virtual Result GetErrorContext(sf::Out<err::ErrorContext> out) override {
*out = ErrorContextHolder::GetErrorContextImpl();
return ResultSuccess();
R_SUCCEED();
}
Result Run();

14
stratosphere/ams_mitm/source/sysupdater/sysupdater_fs_utils.cpp
View File

@@ -54,7 +54,7 @@ namespace ams::mitm::sysupdater {
const bool is_nsp = util::Strnicmp(extension, NspExtension, NcaNspExtensionSize) == 0;
R_UNLESS(is_nca || is_nsp, fs::ResultPathNotFound());
return ResultSuccess();
R_SUCCEED();
}
Result ParseMountName(const char **path, std::shared_ptr<ams::fs::fsa::IFileSystem> *out) {
@@ -88,13 +88,13 @@ namespace ams::mitm::sysupdater {
/* Set the output fs. */
*out = std::move(fsa);
} else {
return fs::ResultPathNotFound();
R_THROW(fs::ResultPathNotFound());
}
/* Ensure that there's something that could be a mount name delimiter. */
R_UNLESS(util::Strnlen(*path, fs::EntryNameLengthMax) != 0, fs::ResultPathNotFound());
return ResultSuccess();
R_SUCCEED();
}
Result ParseNsp(const char **path, std::shared_ptr<ams::fs::fsa::IFileSystem> *out, std::shared_ptr<ams::fs::fsa::IFileSystem> base_fs) {
@@ -132,7 +132,7 @@ namespace ams::mitm::sysupdater {
/* Update the path. */
*path = work_path;
return ResultSuccess();
R_SUCCEED();
}
Result ParseNca(const char **path, std::shared_ptr<fssystem::NcaReader> *out, std::shared_ptr<ams::fs::fsa::IFileSystem> base_fs) {
@@ -154,7 +154,7 @@ namespace ams::mitm::sysupdater {
/* Set output reader. */
*out = std::move(nca_reader);
return ResultSuccess();
R_SUCCEED();
}
Result OpenMetaStorage(std::shared_ptr<ams::fs::IStorage> *out, std::shared_ptr<fssystem::IAsynchronousAccessSplitter> *out_splitter, std::shared_ptr<fssystem::NcaReader> nca_reader, fssystem::NcaFsHeader::FsType *out_fs_type) {
@@ -173,7 +173,7 @@ namespace ams::mitm::sysupdater {
/* Set the output fs type. */
*out_fs_type = fs_header_reader.GetFsType();
return ResultSuccess();
R_SUCCEED();
}
Result OpenContentMetaFileSystem(std::shared_ptr<ams::fs::fsa::IFileSystem> *out, const char *path) {
@@ -211,7 +211,7 @@ namespace ams::mitm::sysupdater {
case fssystem::NcaFsHeader::FsType::PartitionFs: return creator_intfs->partition_fs_creator->Create(out, std::move(storage));
case fssystem::NcaFsHeader::FsType::RomFs: return creator_intfs->rom_fs_creator->Create(out, std::move(storage));
default:
return fs::ResultInvalidNcaFileSystemType();
R_THROW(fs::ResultInvalidNcaFileSystemType());
}
}

38
stratosphere/ams_mitm/source/sysupdater/sysupdater_service.cpp
View File

@@ -51,7 +51,7 @@ namespace ams::mitm::sysupdater {
R_SUCCEED_IF(done);
}
return ResultSuccess();
R_SUCCEED();
}
Result ConvertToFsCommonPath(char *dst, size_t dst_size, const char *package_root_path, const char *entry_path) {
@@ -118,13 +118,13 @@ namespace ams::mitm::sysupdater {
*out = ncm::ContentInfo::Make(*content_id, entry.file_size, ncm::ContentType::Meta);
}
return ResultSuccess();
R_SUCCEED();
}));
/* If we didn't find anything, error. */
R_UNLESS(found_system_update, ncm::ResultSystemUpdateNotFoundInPackage());
return ResultSuccess();
R_SUCCEED();
}
Result ValidateSystemUpdate(Result *out_result, Result *out_exfat_result, UpdateValidationInfo *out_info, const ncm::PackagedContentMetaReader &update_reader, const char *package_root) {
@@ -212,7 +212,7 @@ namespace ams::mitm::sysupdater {
util::SNPrintf(path, sizeof(path), "%s%s%s", package_root, content_id_str.data, content_info->GetType() == ncm::ContentType::Meta ? ".cnmt.nca" : ".nca");
if (R_FAILED(ValidateResult(fs::OpenFile(std::addressof(file), path, ams::fs::OpenMode_Read)))) {
*done = true;
return ResultSuccess();
R_SUCCEED();
}
}
ON_SCOPE_EXIT { fs::CloseFile(file); };
@@ -221,12 +221,12 @@ namespace ams::mitm::sysupdater {
s64 file_size;
if (R_FAILED(ValidateResult(fs::GetFileSize(std::addressof(file_size), file)))) {
*done = true;
return ResultSuccess();
R_SUCCEED();
}
if (file_size != content_size) {
*out_result = ncm::ResultInvalidContentHash();
*done = true;
return ResultSuccess();
R_SUCCEED();
}
/* Read and hash the file in chunks. */
@@ -238,7 +238,7 @@ namespace ams::mitm::sysupdater {
const size_t cur_size = std::min(static_cast<size_t>(content_size - ofs), data_buffer_size);
if (R_FAILED(ValidateResult(fs::ReadFile(file, ofs, data_buffer, cur_size)))) {
*done = true;
return ResultSuccess();
R_SUCCEED();
}
sha.Update(data_buffer, cur_size);
@@ -254,7 +254,7 @@ namespace ams::mitm::sysupdater {
if (std::memcmp(std::addressof(calc_digest), std::addressof(content_info->digest), sizeof(ncm::Digest)) != 0) {
*out_result = ncm::ResultInvalidContentHash();
*done = true;
return ResultSuccess();
R_SUCCEED();
}
}
@@ -262,7 +262,7 @@ namespace ams::mitm::sysupdater {
content_meta_valid[validation_index] = true;
*out_info = {};
return ResultSuccess();
R_SUCCEED();
}));
/* If we're otherwise going to succeed, ensure that every content was found. */
@@ -284,7 +284,7 @@ namespace ams::mitm::sysupdater {
}
}
return ResultSuccess();
R_SUCCEED();
}
Result FormatUserPackagePath(ncm::Path *out, const ncm::Path &user_path) {
@@ -300,7 +300,7 @@ namespace ams::mitm::sysupdater {
out->str[len - 1] = '\x00';
}
return ResultSuccess();
R_SUCCEED();
}
const char *GetFirmwareVariationSettingName(settings::system::PlatformRegion region) {
@@ -382,7 +382,7 @@ namespace ams::mitm::sysupdater {
/* Set the parsed update info. */
out.SetValue(update_info);
return ResultSuccess();
R_SUCCEED();
}
Result SystemUpdateService::ValidateUpdate(sf::Out<Result> out_validate_result, sf::Out<Result> out_validate_exfat_result, sf::Out<UpdateValidationInfo> out_validate_info, const ncm::Path &path) {
@@ -407,7 +407,7 @@ namespace ams::mitm::sysupdater {
R_TRY(ValidateSystemUpdate(out_validate_result.GetPointer(), out_validate_exfat_result.GetPointer(), out_validate_info.GetPointer(), reader, package_root.str));
}
return ResultSuccess();
R_SUCCEED();
};
Result SystemUpdateService::SetupUpdate(sf::CopyHandle &&transfer_memory, u64 transfer_memory_size, const ncm::Path &path, bool exfat) {
@@ -435,7 +435,7 @@ namespace ams::mitm::sysupdater {
out_event_handle.SetValue(async_result.GetImpl().GetEvent().GetReadableHandle(), false);
*out_async = std::move(async_result);
return ResultSuccess();
R_SUCCEED();
}
Result SystemUpdateService::GetPrepareUpdateProgress(sf::Out<SystemUpdateProgress> out) {
@@ -445,7 +445,7 @@ namespace ams::mitm::sysupdater {
/* Get the progress. */
auto install_progress = m_update_task->GetProgress();
out.SetValue({ .current_size = install_progress.installed_size, .total_size = install_progress.total_size });
return ResultSuccess();
R_SUCCEED();
}
Result SystemUpdateService::HasPreparedUpdate(sf::Out<bool> out) {
@@ -453,7 +453,7 @@ namespace ams::mitm::sysupdater {
R_UNLESS(m_setup_update, ns::ResultCardUpdateNotSetup());
out.SetValue(m_update_task->GetProgress().state == ncm::InstallProgressState::Downloaded);
return ResultSuccess();
R_SUCCEED();
}
Result SystemUpdateService::ApplyPreparedUpdate() {
@@ -466,7 +466,7 @@ namespace ams::mitm::sysupdater {
/* Apply the task. */
R_TRY(m_apply_manager.ApplyPackageTask(std::addressof(*m_update_task)));
return ResultSuccess();
R_SUCCEED();
}
Result SystemUpdateService::SetupUpdateImpl(sf::NativeHandle &&transfer_memory, u64 transfer_memory_size, const ncm::Path &path, bool exfat, ncm::FirmwareVariationId firmware_variation_id) {
@@ -485,7 +485,7 @@ namespace ams::mitm::sysupdater {
/* The update is now set up. */
m_setup_update = true;
return ResultSuccess();
R_SUCCEED();
}
Result SystemUpdateService::InitializeUpdateTask(sf::NativeHandle &&transfer_memory, u64 transfer_memory_size, const ncm::Path &path, bool exfat, ncm::FirmwareVariationId firmware_variation_id) {
@@ -516,7 +516,7 @@ namespace ams::mitm::sysupdater {
/* We successfully setup the update. */
tmem_guard.Cancel();
return ResultSuccess();
R_SUCCEED();
}
}

4
stratosphere/ams_mitm/source/sysupdater/sysupdater_thread_allocator.cpp
View File

@@ -31,11 +31,11 @@ namespace ams::mitm::sysupdater {
.stack_size = m_stack_size,
};
m_bitmap |= mask;
return ResultSuccess();
R_SUCCEED();
}
}
return ns::ResultOutOfMaxRunningTask();
R_THROW(ns::ResultOutOfMaxRunningTask());
}
void ThreadAllocator::Free(const ThreadInfo &info) {