mika/Atmosphere-libs
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere-libs.git synced 2025-06-22 19:32:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

strat: always use explicit result namespacing

Browse Source
This commit is contained in:
Michael Scire 2021-10-09 10:36:21 -07:00
parent ea0bb620f2
commit e2df2f98a3
19 changed files with 142 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libstratosphere/include/stratosphere/kvdb/kvdb_auto_buffer.hpp
View File

@ -69,7 +69,7 @@ namespace ams::kvdb {
/* Allocate a buffer. */ /* Allocate a buffer. */
this->buffer = new (std::nothrow) u8[size]; this->buffer = new (std::nothrow) u8[size];
R_UNLESS(this->buffer != nullptr, ResultAllocationFailed()); R_UNLESS(this->buffer != nullptr, kvdb::ResultAllocationFailed());
this->size = size; this->size = size;
return ResultSuccess(); return ResultSuccess();

6
libstratosphere/include/stratosphere/kvdb/kvdb_file_key_value_cache.hpp
View File

@ -219,7 +219,7 @@ namespace ams::kvdb {
} R_END_TRY_CATCH; } R_END_TRY_CATCH;
/* Check that the entry type is correct. */ /* Check that the entry type is correct. */
R_UNLESS(entry_type == type, ResultInvalidFilesystemState()); R_UNLESS(entry_type == type, kvdb::ResultInvalidFilesystemState());
/* The entry exists and is the correct type. */ /* The entry exists and is the correct type. */
*out = true; *out = true;
@ -249,10 +249,10 @@ namespace ams::kvdb {
R_TRY(DirectoryExists(&has_kvs, GetFileKeyValueStorePath(dir))); R_TRY(DirectoryExists(&has_kvs, GetFileKeyValueStorePath(dir)));
/* If neither exists, CreateNewCache was never called. */ /* If neither exists, CreateNewCache was never called. */
R_UNLESS(has_lru || has_kvs, ResultNotCreated()); R_UNLESS(has_lru || has_kvs, kvdb::ResultNotCreated());
/* If one exists but not the other, we have an invalid state. */ /* If one exists but not the other, we have an invalid state. */
R_UNLESS(has_lru && has_kvs, ResultInvalidFilesystemState()); R_UNLESS(has_lru && has_kvs, kvdb::ResultInvalidFilesystemState());
return ResultSuccess(); return ResultSuccess();
} }

22
libstratosphere/include/stratosphere/kvdb/kvdb_memory_key_value_store.hpp
View File

@ -122,7 +122,7 @@ namespace ams::kvdb {
Result Initialize(size_t capacity, MemoryResource *mr) { Result Initialize(size_t capacity, MemoryResource *mr) {
this->entries = reinterpret_cast<Entry *>(mr->Allocate(sizeof(Entry) * capacity)); this->entries = reinterpret_cast<Entry *>(mr->Allocate(sizeof(Entry) * capacity));
R_UNLESS(this->entries != nullptr, ResultAllocationFailed()); R_UNLESS(this->entries != nullptr, kvdb::ResultAllocationFailed());
this->capacity = capacity; this->capacity = capacity;
this->memory_resource = mr; this->memory_resource = mr;
return ResultSuccess(); return ResultSuccess();
@ -136,14 +136,14 @@ namespace ams::kvdb {
this->memory_resource->Deallocate(it->GetValuePointer(), it->GetValueSize()); this->memory_resource->Deallocate(it->GetValuePointer(), it->GetValueSize());
} else { } else {
/* We need to add a new entry. Check we have room, move future keys forward. */ /* We need to add a new entry. Check we have room, move future keys forward. */
R_UNLESS(this->count < this->capacity, ResultOutOfKeyResource()); R_UNLESS(this->count < this->capacity, kvdb::ResultOutOfKeyResource());
std::memmove(it + 1, it, sizeof(*it) * (this->end() - it)); std::memmove(it + 1, it, sizeof(*it) * (this->end() - it));
this->count++; this->count++;
} }
/* Allocate new value. */ /* Allocate new value. */
void *new_value = this->memory_resource->Allocate(value_size); void *new_value = this->memory_resource->Allocate(value_size);
R_UNLESS(new_value != nullptr, ResultAllocationFailed()); R_UNLESS(new_value != nullptr, kvdb::ResultAllocationFailed());
std::memcpy(new_value, value, value_size); std::memcpy(new_value, value, value_size);
/* Save the new Entry in the map. */ /* Save the new Entry in the map. */
@ -152,7 +152,7 @@ namespace ams::kvdb {
} }
Result AddUnsafe(const Key &key, void *value, size_t value_size) { Result AddUnsafe(const Key &key, void *value, size_t value_size) {
R_UNLESS(this->count < this->capacity, ResultOutOfKeyResource()); R_UNLESS(this->count < this->capacity, kvdb::ResultOutOfKeyResource());
this->entries[this->count++] = Entry(key, value, value_size); this->entries[this->count++] = Entry(key, value, value_size);
return ResultSuccess(); return ResultSuccess();
@ -161,7 +161,7 @@ namespace ams::kvdb {
Result Remove(const Key &key) { Result Remove(const Key &key) {
/* Find entry for key. */ /* Find entry for key. */
Entry *it = this->find(key); Entry *it = this->find(key);
R_UNLESS(it != this->end(), ResultKeyNotFound()); R_UNLESS(it != this->end(), kvdb::ResultKeyNotFound());
/* Free the value, move entries back. */ /* Free the value, move entries back. */
this->memory_resource->Deallocate(it->GetValuePointer(), it->GetValueSize()); this->memory_resource->Deallocate(it->GetValuePointer(), it->GetValueSize());
@ -324,7 +324,7 @@ namespace ams::kvdb {
/* Allocate memory for value. */ /* Allocate memory for value. */
void *new_value = this->memory_resource->Allocate(value_size); void *new_value = this->memory_resource->Allocate(value_size);
R_UNLESS(new_value != nullptr, ResultAllocationFailed()); R_UNLESS(new_value != nullptr, kvdb::ResultAllocationFailed());
auto value_guard = SCOPE_GUARD { this->memory_resource->Deallocate(new_value, value_size); }; auto value_guard = SCOPE_GUARD { this->memory_resource->Deallocate(new_value, value_size); };
/* Read key and value. */ /* Read key and value. */
@ -380,7 +380,7 @@ namespace ams::kvdb {
Result Get(size_t *out_size, void *out_value, size_t max_out_size, const Key &key) { Result Get(size_t *out_size, void *out_value, size_t max_out_size, const Key &key) {
/* Find entry. */ /* Find entry. */
auto it = this->find(key); auto it = this->find(key);
R_UNLESS(it != this->end(), ResultKeyNotFound()); R_UNLESS(it != this->end(), kvdb::ResultKeyNotFound());
size_t size = std::min(max_out_size, it->GetValueSize()); size_t size = std::min(max_out_size, it->GetValueSize());
std::memcpy(out_value, it->GetValuePointer(), size); std::memcpy(out_value, it->GetValuePointer(), size);
@ -392,7 +392,7 @@ namespace ams::kvdb {
Result GetValuePointer(Value **out_value, const Key &key) { Result GetValuePointer(Value **out_value, const Key &key) {
/* Find entry. */ /* Find entry. */
auto it = this->find(key); auto it = this->find(key);
R_UNLESS(it != this->end(), ResultKeyNotFound()); R_UNLESS(it != this->end(), kvdb::ResultKeyNotFound());
*out_value = it->template GetValuePointer<Value>(); *out_value = it->template GetValuePointer<Value>();
return ResultSuccess(); return ResultSuccess();
@ -402,7 +402,7 @@ namespace ams::kvdb {
Result GetValuePointer(const Value **out_value, const Key &key) const { Result GetValuePointer(const Value **out_value, const Key &key) const {
/* Find entry. */ /* Find entry. */
auto it = this->find(key); auto it = this->find(key);
R_UNLESS(it != this->end(), ResultKeyNotFound()); R_UNLESS(it != this->end(), kvdb::ResultKeyNotFound());
*out_value = it->template GetValuePointer<Value>(); *out_value = it->template GetValuePointer<Value>();
return ResultSuccess(); return ResultSuccess();
@ -412,7 +412,7 @@ namespace ams::kvdb {
Result GetValue(Value *out_value, const Key &key) const { Result GetValue(Value *out_value, const Key &key) const {
/* Find entry. */ /* Find entry. */
auto it = this->find(key); auto it = this->find(key);
R_UNLESS(it != this->end(), ResultKeyNotFound()); R_UNLESS(it != this->end(), kvdb::ResultKeyNotFound());
*out_value = it->template GetValue<Value>(); *out_value = it->template GetValue<Value>();
return ResultSuccess(); return ResultSuccess();
@ -421,7 +421,7 @@ namespace ams::kvdb {
Result GetValueSize(size_t *out_size, const Key &key) const { Result GetValueSize(size_t *out_size, const Key &key) const {
/* Find entry. */ /* Find entry. */
auto it = this->find(key); auto it = this->find(key);
R_UNLESS(it != this->end(), ResultKeyNotFound()); R_UNLESS(it != this->end(), kvdb::ResultKeyNotFound());
*out_size = it->GetValueSize(); *out_size = it->GetValueSize();
return ResultSuccess(); return ResultSuccess();

2
libstratosphere/include/stratosphere/ncm/ncm_auto_buffer.hpp
View File

@ -69,7 +69,7 @@ namespace ams::ncm {
/* Allocate a buffer. */ /* Allocate a buffer. */
this->buffer = new (std::nothrow) u8[size]; this->buffer = new (std::nothrow) u8[size];
R_UNLESS(this->buffer != nullptr, ResultAllocationFailed()); R_UNLESS(this->buffer != nullptr, ncm::ResultAllocationFailed());
this->size = size; this->size = size;
return ResultSuccess(); return ResultSuccess();

8
libstratosphere/source/fssrv/fssrv_filesystem_interface_adapter.cpp
View File

@ -36,7 +36,7 @@ namespace ams::fssrv::impl {
} }
Result FileInterfaceAdapter::Read(ams::sf::Out<s64> out, s64 offset, const ams::sf::OutNonSecureBuffer &buffer, s64 size, fs::ReadOption option) { Result FileInterfaceAdapter::Read(ams::sf::Out<s64> out, s64 offset, const ams::sf::OutNonSecureBuffer &buffer, s64 size, fs::ReadOption option) {
/* TODO: N retries on ResultDataCorrupted, we may want to eventually. */ /* TODO: N retries on fs::ResultDataCorrupted, we may want to eventually. */
/* TODO: Deep retry */ /* TODO: Deep retry */
R_UNLESS(offset >= 0, fs::ResultInvalidOffset()); R_UNLESS(offset >= 0, fs::ResultInvalidOffset());
R_UNLESS(size >= 0, fs::ResultInvalidSize()); R_UNLESS(size >= 0, fs::ResultInvalidSize());
@ -126,7 +126,7 @@ namespace ams::fssrv::impl {
const s64 max_num_entries = out_entries.GetSize() / sizeof(fs::DirectoryEntry); const s64 max_num_entries = out_entries.GetSize() / sizeof(fs::DirectoryEntry);
R_UNLESS(max_num_entries >= 0, fs::ResultInvalidSize()); R_UNLESS(max_num_entries >= 0, fs::ResultInvalidSize());
/* TODO: N retries on ResultDataCorrupted, we may want to eventually. */ /* TODO: N retries on fs::ResultDataCorrupted, we may want to eventually. */
return this->base_dir->Read(out.GetPointer(), reinterpret_cast<fs::DirectoryEntry *>(out_entries.GetPointer()), max_num_entries); return this->base_dir->Read(out.GetPointer(), reinterpret_cast<fs::DirectoryEntry *>(out_entries.GetPointer()), max_num_entries);
} }
@ -266,7 +266,7 @@ namespace ams::fssrv::impl {
PathNormalizer normalizer(path.str); PathNormalizer normalizer(path.str);
R_UNLESS(normalizer.GetPath() != nullptr, normalizer.GetResult()); R_UNLESS(normalizer.GetPath() != nullptr, normalizer.GetResult());
/* TODO: N retries on ResultDataCorrupted, we may want to eventually. */ /* TODO: N retries on fs::ResultDataCorrupted, we may want to eventually. */
std::unique_ptr<fs::fsa::IFile> file; std::unique_ptr<fs::fsa::IFile> file;
R_TRY(this->base_fs->OpenFile(&file, normalizer.GetPath(), static_cast<fs::OpenMode>(mode))); R_TRY(this->base_fs->OpenFile(&file, normalizer.GetPath(), static_cast<fs::OpenMode>(mode)));
@ -294,7 +294,7 @@ namespace ams::fssrv::impl {
PathNormalizer normalizer(path.str); PathNormalizer normalizer(path.str);
R_UNLESS(normalizer.GetPath() != nullptr, normalizer.GetResult()); R_UNLESS(normalizer.GetPath() != nullptr, normalizer.GetResult());
/* TODO: N retries on ResultDataCorrupted, we may want to eventually. */ /* TODO: N retries on fs::ResultDataCorrupted, we may want to eventually. */
std::unique_ptr<fs::fsa::IDirectory> dir; std::unique_ptr<fs::fsa::IDirectory> dir;
R_TRY(this->base_fs->OpenDirectory(&dir, normalizer.GetPath(), static_cast<fs::OpenDirectoryMode>(mode))); R_TRY(this->base_fs->OpenDirectory(&dir, normalizer.GetPath(), static_cast<fs::OpenDirectoryMode>(mode)));

2
libstratosphere/source/fssrv/fssrv_storage_interface_adapter.cpp
View File

@ -43,7 +43,7 @@ namespace ams::fssrv::impl {
} }
Result StorageInterfaceAdapter::Read(s64 offset, const ams::sf::OutNonSecureBuffer &buffer, s64 size) { Result StorageInterfaceAdapter::Read(s64 offset, const ams::sf::OutNonSecureBuffer &buffer, s64 size) {
/* TODO: N retries on ResultDataCorrupted, we may want to eventually. */ /* TODO: N retries on fs::ResultDataCorrupted, we may want to eventually. */
/* TODO: Deep retry */ /* TODO: Deep retry */
R_UNLESS(offset >= 0, fs::ResultInvalidOffset()); R_UNLESS(offset >= 0, fs::ResultInvalidOffset());
R_UNLESS(size >= 0, fs::ResultInvalidSize()); R_UNLESS(size >= 0, fs::ResultInvalidSize());

2
libstratosphere/source/fssystem/fssystem_directory_redirection_filesystem.cpp
View File

@ -68,7 +68,7 @@ namespace ams::fssystem {
const size_t size = normalized_path_len + 1; const size_t size = normalized_path_len + 1;
char *new_dir = static_cast<char *>(fs::impl::Allocate(size)); char *new_dir = static_cast<char *>(fs::impl::Allocate(size));
AMS_ABORT_UNLESS(new_dir != nullptr); AMS_ABORT_UNLESS(new_dir != nullptr);
/* TODO: custom ResultAllocationFailure? */ /* TODO: custom fs::ResultAllocationFailure? */
/* Copy path in. */ /* Copy path in. */
std::memcpy(new_dir, normalized_path, normalized_path_len); std::memcpy(new_dir, normalized_path, normalized_path_len);

2
libstratosphere/source/fssystem/fssystem_directory_savedata_filesystem.cpp
View File

@ -133,7 +133,7 @@ namespace ams::fssystem {
} }
/* TODO: Return a result here? Nintendo does not, but they have other allocation failed results. */ /* TODO: Return a result here? Nintendo does not, but they have other allocation failed results. */
/* Consider returning ResultFsAllocationFailureInDirectorySaveDataFileSystem? */ /* Consider returning fs::ResultFsAllocationFailureInDirectorySaveDataFileSystem? */
AMS_ABORT_UNLESS(false); AMS_ABORT_UNLESS(false);
} }

2
libstratosphere/source/i2c/i2c_command_list_formatter.cpp
View File

@ -19,7 +19,7 @@
namespace ams::i2c { namespace ams::i2c {
Result CommandListFormatter::IsEnqueueAble(size_t sz) const { Result CommandListFormatter::IsEnqueueAble(size_t sz) const {
R_UNLESS(this->command_list_length - this->current_index >= sz, ResultCommandListFull()); R_UNLESS(this->command_list_length - this->current_index >= sz, i2c::ResultCommandListFull());
return ResultSuccess(); return ResultSuccess();
} }

12
libstratosphere/source/kvdb/kvdb_archive.cpp
View File

@ -30,7 +30,7 @@ namespace ams::kvdb {
u32 entry_count; u32 entry_count;
Result Validate() const { Result Validate() const {
R_UNLESS(std::memcmp(this->magic, ArchiveHeaderMagic, sizeof(ArchiveHeaderMagic)) == 0, ResultInvalidKeyValue()); R_UNLESS(std::memcmp(this->magic, ArchiveHeaderMagic, sizeof(ArchiveHeaderMagic)) == 0, kvdb::ResultInvalidKeyValue());
return ResultSuccess(); return ResultSuccess();
} }
@ -49,7 +49,7 @@ namespace ams::kvdb {
u32 value_size; u32 value_size;
Result Validate() const { Result Validate() const {
R_UNLESS(std::memcmp(this->magic, ArchiveEntryMagic, sizeof(ArchiveEntryMagic)) == 0, ResultInvalidKeyValue()); R_UNLESS(std::memcmp(this->magic, ArchiveEntryMagic, sizeof(ArchiveEntryMagic)) == 0, kvdb::ResultInvalidKeyValue());
return ResultSuccess(); return ResultSuccess();
} }
@ -68,8 +68,8 @@ namespace ams::kvdb {
/* Reader functionality. */ /* Reader functionality. */
Result ArchiveReader::Peek(void *dst, size_t size) { Result ArchiveReader::Peek(void *dst, size_t size) {
/* Bounds check. */ /* Bounds check. */
R_UNLESS(this->offset + size <= this->buffer.GetSize(), ResultInvalidKeyValue()); R_UNLESS(this->offset + size <= this->buffer.GetSize(), kvdb::ResultInvalidKeyValue());
R_UNLESS(this->offset < this->offset + size, ResultInvalidKeyValue()); R_UNLESS(this->offset < this->offset + size, kvdb::ResultInvalidKeyValue());
std::memcpy(dst, this->buffer.Get() + this->offset, size); std::memcpy(dst, this->buffer.Get() + this->offset, size);
return ResultSuccess(); return ResultSuccess();
@ -129,8 +129,8 @@ namespace ams::kvdb {
/* Writer functionality. */ /* Writer functionality. */
Result ArchiveWriter::Write(const void *src, size_t size) { Result ArchiveWriter::Write(const void *src, size_t size) {
/* Bounds check. */ /* Bounds check. */
R_UNLESS(this->offset + size <= this->buffer.GetSize(), ResultInvalidKeyValue()); R_UNLESS(this->offset + size <= this->buffer.GetSize(), kvdb::ResultInvalidKeyValue());
R_UNLESS(this->offset < this->offset + size, ResultInvalidKeyValue()); R_UNLESS(this->offset < this->offset + size, kvdb::ResultInvalidKeyValue());
std::memcpy(this->buffer.Get() + this->offset, src, size); std::memcpy(this->buffer.Get() + this->offset, src, size);
this->offset += size; this->offset += size;

26
libstratosphere/source/kvdb/kvdb_file_key_value_store.cpp
View File

@ -37,7 +37,7 @@ namespace ams::kvdb {
/* If we have memory to work with, ensure it's at least enough for the cache entries. */ /* If we have memory to work with, ensure it's at least enough for the cache entries. */
if (this->backing_buffer != nullptr) { if (this->backing_buffer != nullptr) {
this->entries = static_cast<decltype(this->entries)>(this->Allocate(sizeof(*this->entries) * this->capacity)); this->entries = static_cast<decltype(this->entries)>(this->Allocate(sizeof(*this->entries) * this->capacity));
R_UNLESS(this->entries != nullptr, ResultBufferInsufficient()); R_UNLESS(this->entries != nullptr, kvdb::ResultBufferInsufficient());
} }
return ResultSuccess(); return ResultSuccess();
@ -153,13 +153,13 @@ namespace ams::kvdb {
/* TODO: Nintendo does not validate that the key is valid hex. Should we do this? */ /* TODO: Nintendo does not validate that the key is valid hex. Should we do this? */
const size_t file_name_len = file_name.GetLength(); const size_t file_name_len = file_name.GetLength();
const size_t key_name_len = file_name_len - FileExtensionLength; const size_t key_name_len = file_name_len - FileExtensionLength;
R_UNLESS(file_name_len >= FileExtensionLength + 2, ResultInvalidKeyValue()); R_UNLESS(file_name_len >= FileExtensionLength + 2, kvdb::ResultInvalidKeyValue());
R_UNLESS(file_name.EndsWith(FileExtension), ResultInvalidKeyValue()); R_UNLESS(file_name.EndsWith(FileExtension), kvdb::ResultInvalidKeyValue());
R_UNLESS(util::IsAligned(key_name_len, 2), ResultInvalidKeyValue()); R_UNLESS(util::IsAligned(key_name_len, 2), kvdb::ResultInvalidKeyValue());
/* Validate that we have space for the converted key. */ /* Validate that we have space for the converted key. */
const size_t key_size = key_name_len / 2; const size_t key_size = key_name_len / 2;
R_UNLESS(key_size <= max_out_size, ResultBufferInsufficient()); R_UNLESS(key_size <= max_out_size, kvdb::ResultBufferInsufficient());
/* Convert the hex key back. */ /* Convert the hex key back. */
u8 *out_key = static_cast<u8 *>(_out_key); u8 *out_key = static_cast<u8 *>(_out_key);
@ -195,7 +195,7 @@ namespace ams::kvdb {
std::scoped_lock lk(this->lock); std::scoped_lock lk(this->lock);
/* Ensure key size is small enough. */ /* Ensure key size is small enough. */
R_UNLESS(key_size <= MaxKeySize, ResultOutOfKeyResource()); R_UNLESS(key_size <= MaxKeySize, kvdb::ResultOutOfKeyResource());
/* Try to get from cache. */ /* Try to get from cache. */
{ {
@ -209,7 +209,7 @@ namespace ams::kvdb {
/* Open the value file. */ /* Open the value file. */
fs::FileHandle file; fs::FileHandle file;
R_TRY_CATCH(fs::OpenFile(std::addressof(file), this->GetPath(key, key_size), fs::OpenMode_Read)) { R_TRY_CATCH(fs::OpenFile(std::addressof(file), this->GetPath(key, key_size), fs::OpenMode_Read)) {
R_CONVERT(fs::ResultPathNotFound, ResultKeyNotFound()); R_CONVERT(fs::ResultPathNotFound, kvdb::ResultKeyNotFound());
} R_END_TRY_CATCH; } R_END_TRY_CATCH;
ON_SCOPE_EXIT { fs::CloseFile(file); }; ON_SCOPE_EXIT { fs::CloseFile(file); };
@ -218,7 +218,7 @@ namespace ams::kvdb {
R_TRY(fs::GetFileSize(std::addressof(file_size), file)); R_TRY(fs::GetFileSize(std::addressof(file_size), file));
/* Ensure there's enough space for the value. */ /* Ensure there's enough space for the value. */
R_UNLESS(file_size <= static_cast<s64>(max_out_size), ResultBufferInsufficient()); R_UNLESS(file_size <= static_cast<s64>(max_out_size), kvdb::ResultBufferInsufficient());
/* Read the value. */ /* Read the value. */
const size_t value_size = static_cast<size_t>(file_size); const size_t value_size = static_cast<size_t>(file_size);
@ -234,7 +234,7 @@ namespace ams::kvdb {
std::scoped_lock lk(this->lock); std::scoped_lock lk(this->lock);
/* Ensure key size is small enough. */ /* Ensure key size is small enough. */
R_UNLESS(key_size <= MaxKeySize, ResultOutOfKeyResource()); R_UNLESS(key_size <= MaxKeySize, kvdb::ResultOutOfKeyResource());
/* Try to get from cache. */ /* Try to get from cache. */
{ {
@ -248,7 +248,7 @@ namespace ams::kvdb {
/* Open the value file. */ /* Open the value file. */
fs::FileHandle file; fs::FileHandle file;
R_TRY_CATCH(fs::OpenFile(std::addressof(file), this->GetPath(key, key_size), fs::OpenMode_Read)) { R_TRY_CATCH(fs::OpenFile(std::addressof(file), this->GetPath(key, key_size), fs::OpenMode_Read)) {
R_CONVERT(fs::ResultPathNotFound, ResultKeyNotFound()); R_CONVERT(fs::ResultPathNotFound, kvdb::ResultKeyNotFound());
} R_END_TRY_CATCH; } R_END_TRY_CATCH;
ON_SCOPE_EXIT { fs::CloseFile(file); }; ON_SCOPE_EXIT { fs::CloseFile(file); };
@ -264,7 +264,7 @@ namespace ams::kvdb {
std::scoped_lock lk(this->lock); std::scoped_lock lk(this->lock);
/* Ensure key size is small enough. */ /* Ensure key size is small enough. */
R_UNLESS(key_size <= MaxKeySize, ResultOutOfKeyResource()); R_UNLESS(key_size <= MaxKeySize, kvdb::ResultOutOfKeyResource());
/* When the cache contains the key being set, Nintendo invalidates the cache. */ /* When the cache contains the key being set, Nintendo invalidates the cache. */
if (this->cache.Contains(key, key_size)) { if (this->cache.Contains(key, key_size)) {
@ -293,7 +293,7 @@ namespace ams::kvdb {
std::scoped_lock lk(this->lock); std::scoped_lock lk(this->lock);
/* Ensure key size is small enough. */ /* Ensure key size is small enough. */
R_UNLESS(key_size <= MaxKeySize, ResultOutOfKeyResource()); R_UNLESS(key_size <= MaxKeySize, kvdb::ResultOutOfKeyResource());
/* When the cache contains the key being set, Nintendo invalidates the cache. */ /* When the cache contains the key being set, Nintendo invalidates the cache. */
if (this->cache.Contains(key, key_size)) { if (this->cache.Contains(key, key_size)) {
@ -302,7 +302,7 @@ namespace ams::kvdb {
/* Remove the file. */ /* Remove the file. */
R_TRY_CATCH(fs::DeleteFile(this->GetPath(key, key_size))) { R_TRY_CATCH(fs::DeleteFile(this->GetPath(key, key_size))) {
R_CONVERT(fs::ResultPathNotFound, ResultKeyNotFound()) R_CONVERT(fs::ResultPathNotFound, kvdb::ResultKeyNotFound())
} R_END_TRY_CATCH; } R_END_TRY_CATCH;
return ResultSuccess(); return ResultSuccess();

20
libstratosphere/source/ncm/ncm_content_manager_impl.cpp
View File

@ -94,21 +94,21 @@ namespace ams::ncm {
ALWAYS_INLINE Result GetContentStorageNotActiveResult(StorageId storage_id) { ALWAYS_INLINE Result GetContentStorageNotActiveResult(StorageId storage_id) {
switch (storage_id) { switch (storage_id) {
case StorageId::GameCard: return ResultGameCardContentStorageNotActive(); case StorageId::GameCard: return ncm::ResultGameCardContentStorageNotActive();
case StorageId::BuiltInSystem: return ResultBuiltInSystemContentStorageNotActive(); case StorageId::BuiltInSystem: return ncm::ResultBuiltInSystemContentStorageNotActive();
case StorageId::BuiltInUser: return ResultBuiltInUserContentStorageNotActive(); case StorageId::BuiltInUser: return ncm::ResultBuiltInUserContentStorageNotActive();
case StorageId::SdCard: return ResultSdCardContentStorageNotActive(); case StorageId::SdCard: return ncm::ResultSdCardContentStorageNotActive();
default: return ResultUnknownContentStorageNotActive(); default: return ncm::ResultUnknownContentStorageNotActive();
} }
} }
ALWAYS_INLINE Result GetContentMetaDatabaseNotActiveResult(StorageId storage_id) { ALWAYS_INLINE Result GetContentMetaDatabaseNotActiveResult(StorageId storage_id) {
switch (storage_id) { switch (storage_id) {
case StorageId::GameCard: return ResultGameCardContentMetaDatabaseNotActive(); case StorageId::GameCard: return ncm::ResultGameCardContentMetaDatabaseNotActive();
case StorageId::BuiltInSystem: return ResultBuiltInSystemContentMetaDatabaseNotActive(); case StorageId::BuiltInSystem: return ncm::ResultBuiltInSystemContentMetaDatabaseNotActive();
case StorageId::BuiltInUser: return ResultBuiltInUserContentMetaDatabaseNotActive(); case StorageId::BuiltInUser: return ncm::ResultBuiltInUserContentMetaDatabaseNotActive();
case StorageId::SdCard: return ResultSdCardContentMetaDatabaseNotActive(); case StorageId::SdCard: return ncm::ResultSdCardContentMetaDatabaseNotActive();
default: return ResultUnknownContentMetaDatabaseNotActive(); default: return ncm::ResultUnknownContentMetaDatabaseNotActive();
} }
} }

2
libstratosphere/source/ncm/ncm_on_memory_content_meta_database_impl.cpp
View File

@ -89,7 +89,7 @@ namespace ams::ncm {
Result OnMemoryContentMetaDatabaseImpl::LookupOrphanContent(const sf::OutArray<bool> &out_orphaned, const sf::InArray<ContentId> &content_ids) { Result OnMemoryContentMetaDatabaseImpl::LookupOrphanContent(const sf::OutArray<bool> &out_orphaned, const sf::InArray<ContentId> &content_ids) {
AMS_UNUSED(out_orphaned, content_ids); AMS_UNUSED(out_orphaned, content_ids);
return ResultInvalidContentMetaDatabase(); return ncm::ResultInvalidContentMetaDatabase();
} }
Result OnMemoryContentMetaDatabaseImpl::Commit() { Result OnMemoryContentMetaDatabaseImpl::Commit() {

56
libstratosphere/source/settings/impl/settings_key_value_store.cpp
View File

@ -375,7 +375,7 @@ namespace ams::settings::impl {
/* If the default value size is > 0, copy it to the map value. */ /* If the default value size is > 0, copy it to the map value. */
if (map_value.default_value_size > 0) { if (map_value.default_value_size > 0) {
/* Allocate the default value if there is sufficient memory available. */ /* Allocate the default value if there is sufficient memory available. */
R_UNLESS(GetHeapAllocatableSize() >= map_value.default_value_size, ResultSettingsItemValueAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= map_value.default_value_size, settings::ResultSettingsItemValueAllocationFailed());
map_value.default_value = AllocateFromHeap(map_value.default_value_size); map_value.default_value = AllocateFromHeap(map_value.default_value_size);
AMS_ASSERT(map_value.default_value != nullptr); AMS_ASSERT(map_value.default_value != nullptr);
@ -389,7 +389,7 @@ namespace ams::settings::impl {
map_value.current_value = map_value.default_value; map_value.current_value = map_value.default_value;
} else if (map_value.current_value_size > 0) { } else if (map_value.current_value_size > 0) {
/* Allocate the current value if there is sufficient memory available. */ /* Allocate the current value if there is sufficient memory available. */
R_UNLESS(GetHeapAllocatableSize() >= map_value.current_value_size, ResultSettingsItemValueAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= map_value.current_value_size, settings::ResultSettingsItemValueAllocationFailed());
map_value.current_value = AllocateFromHeap(map_value.current_value_size); map_value.current_value = AllocateFromHeap(map_value.current_value_size);
AMS_ASSERT(map_value.current_value != nullptr); AMS_ASSERT(map_value.current_value != nullptr);
@ -604,7 +604,7 @@ namespace ams::settings::impl {
if (current_value_size > 0) { if (current_value_size > 0) {
/* Ensure there is sufficient memory for the value. */ /* Ensure there is sufficient memory for the value. */
R_UNLESS(GetHeapAllocatableSize() >= current_value_size, ResultSettingsItemValueAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= current_value_size, settings::ResultSettingsItemValueAllocationFailed());
/* Allocate the value buffer. */ /* Allocate the value buffer. */
current_value_buffer = AllocateFromHeap(current_value_size); current_value_buffer = AllocateFromHeap(current_value_size);
@ -642,7 +642,7 @@ namespace ams::settings::impl {
/* Load the map entries. */ /* Load the map entries. */
R_TRY(LoadKeyValueStoreMapEntries(out, data, [](Map &map, const MapKey &key, u8 type, const void *value_buffer, u32 value_size) -> Result { R_TRY(LoadKeyValueStoreMapEntries(out, data, [](Map &map, const MapKey &key, u8 type, const void *value_buffer, u32 value_size) -> Result {
/* Ensure there is sufficient memory for two keys. */ /* Ensure there is sufficient memory for two keys. */
R_UNLESS(GetHeapAllocatableSize() >= MapKeyBufferSize, ResultSettingsItemKeyAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= MapKeyBufferSize, settings::ResultSettingsItemKeyAllocationFailed());
/* Copy the map key. */ /* Copy the map key. */
MapKey default_key = key; MapKey default_key = key;
@ -657,7 +657,7 @@ namespace ams::settings::impl {
if (value_size > 0) { if (value_size > 0) {
/* Ensure there is sufficient memory for the value. */ /* Ensure there is sufficient memory for the value. */
R_UNLESS(GetHeapAllocatableSize() >= value_size, ResultSettingsItemValueAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= value_size, settings::ResultSettingsItemValueAllocationFailed());
/* Allocate the value buffer. */ /* Allocate the value buffer. */
default_value_buffer = AllocateFromHeap(value_size); default_value_buffer = AllocateFromHeap(value_size);
@ -677,7 +677,7 @@ namespace ams::settings::impl {
}; };
/* Ensure there is sufficient memory for the value. */ /* Ensure there is sufficient memory for the value. */
R_UNLESS(GetHeapAllocatableSize() >= MapEntryBufferSize, ResultSettingsItemValueAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= MapEntryBufferSize, settings::ResultSettingsItemValueAllocationFailed());
/* Insert the value into the map. */ /* Insert the value into the map. */
map[std::move(default_key)] = default_value; map[std::move(default_key)] = default_value;
@ -718,7 +718,7 @@ namespace ams::settings::impl {
AMS_ASSERT(key_size > 1); AMS_ASSERT(key_size > 1);
/* Ensure there is sufficient memory for this key. */ /* Ensure there is sufficient memory for this key. */
R_UNLESS(GetHeapAllocatableSize() >= key_size, ResultSettingsItemKeyAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= key_size, settings::ResultSettingsItemKeyAllocationFailed());
/* Read the key. */ /* Read the key. */
void *key_buffer = nullptr; void *key_buffer = nullptr;
@ -727,7 +727,7 @@ namespace ams::settings::impl {
ON_SCOPE_EXIT { FreeToHeap(key_buffer, key_size); }; ON_SCOPE_EXIT { FreeToHeap(key_buffer, key_size); };
/* Ensure there is sufficient memory for two keys. */ /* Ensure there is sufficient memory for two keys. */
R_UNLESS(GetHeapAllocatableSize() >= MapKeyBufferSize, ResultSettingsItemKeyAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= MapKeyBufferSize, settings::ResultSettingsItemKeyAllocationFailed());
const MapKey key(static_cast<const char *>(key_buffer), key_size - 1); const MapKey key(static_cast<const char *>(key_buffer), key_size - 1);
@ -748,7 +748,7 @@ namespace ams::settings::impl {
if (value_size > 0) { if (value_size > 0) {
/* Ensure there is sufficient memory for the value. */ /* Ensure there is sufficient memory for the value. */
R_UNLESS(GetHeapAllocatableSize() >= value_size, ResultSettingsItemValueAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= value_size, settings::ResultSettingsItemValueAllocationFailed());
/* Read the value to the buffer. */ /* Read the value to the buffer. */
R_TRY(ReadDataToHeap(data, offset, std::addressof(value_buffer), value_size)); R_TRY(ReadDataToHeap(data, offset, std::addressof(value_buffer), value_size));
@ -1075,7 +1075,7 @@ namespace ams::settings::impl {
AMS_ASSERT(map != nullptr); AMS_ASSERT(map != nullptr);
/* Ensure there is sufficient memory for two keys. */ /* Ensure there is sufficient memory for two keys. */
R_UNLESS(GetHeapAllocatableSize() >= MapKeyBufferSize, ResultSettingsItemKeyAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= MapKeyBufferSize, settings::ResultSettingsItemKeyAllocationFailed());
/* Create a map key from the key value store's name. */ /* Create a map key from the key value store's name. */
MapKey map_key_header(m_name.value); MapKey map_key_header(m_name.value);
@ -1098,11 +1098,11 @@ namespace ams::settings::impl {
} }
/* Ensure we have located an item map key. */ /* Ensure we have located an item map key. */
R_UNLESS(item_map_key != nullptr, ResultSettingsItemNotFound()); R_UNLESS(item_map_key != nullptr, settings::ResultSettingsItemNotFound());
/* Ensure there is sufficient memory for the item map key. */ /* Ensure there is sufficient memory for the item map key. */
const size_t item_map_key_size = item_map_key->GetCount() + 1; const size_t item_map_key_size = item_map_key->GetCount() + 1;
R_UNLESS(GetHeapAllocatableSize() >= item_map_key_size, ResultSettingsItemKeyIteratorAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= item_map_key_size, settings::ResultSettingsItemKeyIteratorAllocationFailed());
/* Allocate the key buffer. */ /* Allocate the key buffer. */
char *buffer = static_cast<char *>(AllocateFromHeap(item_map_key_size)); char *buffer = static_cast<char *>(AllocateFromHeap(item_map_key_size));
@ -1134,11 +1134,11 @@ namespace ams::settings::impl {
AMS_ASSERT(map != nullptr); AMS_ASSERT(map != nullptr);
/* Ensure there is sufficient memory for two keys. */ /* Ensure there is sufficient memory for two keys. */
R_UNLESS(GetHeapAllocatableSize() >= MapKeyBufferSize, ResultSettingsItemKeyAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= MapKeyBufferSize, settings::ResultSettingsItemKeyAllocationFailed());
/* Find the key in the map. */ /* Find the key in the map. */
const Map::const_iterator it = map->find(MakeMapKey(m_name, item_key)); const Map::const_iterator it = map->find(MakeMapKey(m_name, item_key));
R_UNLESS(it != map->end(), ResultSettingsItemNotFound()); R_UNLESS(it != map->end(), settings::ResultSettingsItemNotFound());
/* Get the map value from the iterator. */ /* Get the map value from the iterator. */
const MapValue &map_value = it->second; const MapValue &map_value = it->second;
@ -1170,11 +1170,11 @@ namespace ams::settings::impl {
AMS_ASSERT(map != nullptr); AMS_ASSERT(map != nullptr);
/* Ensure there is sufficient memory for two keys. */ /* Ensure there is sufficient memory for two keys. */
R_UNLESS(GetHeapAllocatableSize() >= MapKeyBufferSize, ResultSettingsItemKeyAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= MapKeyBufferSize, settings::ResultSettingsItemKeyAllocationFailed());
/* Find the key in the map. */ /* Find the key in the map. */
const Map::const_iterator it = map->find(MakeMapKey(m_name, item_key)); const Map::const_iterator it = map->find(MakeMapKey(m_name, item_key));
R_UNLESS(it != map->end(), ResultSettingsItemNotFound()); R_UNLESS(it != map->end(), settings::ResultSettingsItemNotFound());
/* Output the value size. */ /* Output the value size. */
*out_value_size = it->second.current_value_size; *out_value_size = it->second.current_value_size;
@ -1191,11 +1191,11 @@ namespace ams::settings::impl {
AMS_ASSERT(map != nullptr); AMS_ASSERT(map != nullptr);
/* Ensure there is sufficient memory for two keys. */ /* Ensure there is sufficient memory for two keys. */
R_UNLESS(GetHeapAllocatableSize() >= MapKeyBufferSize, ResultSettingsItemKeyAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= MapKeyBufferSize, settings::ResultSettingsItemKeyAllocationFailed());
/* Find the key in the map. */ /* Find the key in the map. */
const Map::iterator it = map->find(MakeMapKey(m_name, item_key)); const Map::iterator it = map->find(MakeMapKey(m_name, item_key));
R_UNLESS(it != map->end(), ResultSettingsItemNotFound()); R_UNLESS(it != map->end(), settings::ResultSettingsItemNotFound());
/* Get the map value from the iterator. */ /* Get the map value from the iterator. */
MapValue &map_value = it->second; MapValue &map_value = it->second;
@ -1243,11 +1243,11 @@ namespace ams::settings::impl {
AMS_ASSERT(map != nullptr); AMS_ASSERT(map != nullptr);
/* Ensure there is sufficient memory for two keys. */ /* Ensure there is sufficient memory for two keys. */
R_UNLESS(GetHeapAllocatableSize() >= MapKeyBufferSize, ResultSettingsItemKeyAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= MapKeyBufferSize, settings::ResultSettingsItemKeyAllocationFailed());
/* Find the key in the map. */ /* Find the key in the map. */
const Map::iterator it = map->find(MakeMapKey(m_name, item_key)); const Map::iterator it = map->find(MakeMapKey(m_name, item_key));
R_UNLESS(it != map->end(), ResultSettingsItemNotFound()); R_UNLESS(it != map->end(), settings::ResultSettingsItemNotFound());
/* Get the map value from the iterator. */ /* Get the map value from the iterator. */
MapValue &map_value = it->second; MapValue &map_value = it->second;
@ -1264,7 +1264,7 @@ namespace ams::settings::impl {
value_buffer = map_value.default_value; value_buffer = map_value.default_value;
} else if (buffer_size > 0) { } else if (buffer_size > 0) {
/* Allocate the new value if there is sufficient memory available. */ /* Allocate the new value if there is sufficient memory available. */
R_UNLESS(GetHeapAllocatableSize() >= value_size, ResultSettingsItemValueAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= value_size, settings::ResultSettingsItemValueAllocationFailed());
value_buffer = AllocateFromHeap(value_size); value_buffer = AllocateFromHeap(value_size);
AMS_ASSERT(value_buffer != nullptr); AMS_ASSERT(value_buffer != nullptr);
@ -1323,7 +1323,7 @@ namespace ams::settings::impl {
R_TRY(GetMapValueOfKeyValueStoreItemForDebug(std::addressof(map_value), item)); R_TRY(GetMapValueOfKeyValueStoreItemForDebug(std::addressof(map_value), item));
/* Ensure there is sufficient memory for two keys. */ /* Ensure there is sufficient memory for two keys. */
R_UNLESS(GetHeapAllocatableSize() >= MapKeyBufferSize, ResultSettingsItemKeyAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= MapKeyBufferSize, settings::ResultSettingsItemKeyAllocationFailed());
/* Create the map key. */ /* Create the map key. */
MapKey map_key(item.key); MapKey map_key(item.key);
@ -1337,7 +1337,7 @@ namespace ams::settings::impl {
it->second = map_value; it->second = map_value;
} else { } else {
/* Ensure there is sufficient memory for the value. */ /* Ensure there is sufficient memory for the value. */
R_UNLESS(GetHeapAllocatableSize() >= MapEntryBufferSize, ResultSettingsItemValueAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= MapEntryBufferSize, settings::ResultSettingsItemValueAllocationFailed());
/* Assign the map value to the map key in the map. */ /* Assign the map value to the map key in the map. */
(*map)[std::move(map_key)] = map_value; (*map)[std::move(map_key)] = map_value;
@ -1367,24 +1367,24 @@ namespace ams::settings::impl {
AMS_ASSERT(map != nullptr); AMS_ASSERT(map != nullptr);
/* Ensure there is sufficient memory for two keys. */ /* Ensure there is sufficient memory for two keys. */
R_UNLESS(GetHeapAllocatableSize() >= MapKeyBufferSize, ResultSettingsItemKeyAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= MapKeyBufferSize, settings::ResultSettingsItemKeyAllocationFailed());
/* Locate the iterator's current key. */ /* Locate the iterator's current key. */
Map::const_iterator it = map->find(MapKey(out->map_key, static_cast<s32>(out->entire_size) - 1)); Map::const_iterator it = map->find(MapKey(out->map_key, static_cast<s32>(out->entire_size) - 1));
R_UNLESS(it != map->end(), ResultNotFoundSettingsItemKeyIterator()); R_UNLESS(it != map->end(), settings::ResultNotFoundSettingsItemKeyIterator());
/* Increment the iterator, ensuring we aren't at the end of the map. */ /* Increment the iterator, ensuring we aren't at the end of the map. */
R_UNLESS((++it) != map->end(), ResultStopIteration()); R_UNLESS((++it) != map->end(), settings::ResultStopIteration());
/* Get the map key. */ /* Get the map key. */
const MapKey &map_key = it->first; const MapKey &map_key = it->first;
/* Ensure the advanced iterator retains the required name. */ /* Ensure the advanced iterator retains the required name. */
R_UNLESS(std::strncmp(map_key.GetString(), out->map_key, out->header_size) == 0, ResultStopIteration()); R_UNLESS(std::strncmp(map_key.GetString(), out->map_key, out->header_size) == 0, settings::ResultStopIteration());
/* Ensure there is sufficient memory for the map key. */ /* Ensure there is sufficient memory for the map key. */
const size_t map_key_size = map_key.GetCount() + 1; const size_t map_key_size = map_key.GetCount() + 1;
R_UNLESS(GetHeapAllocatableSize() >= map_key_size, ResultSettingsItemKeyIteratorAllocationFailed()); R_UNLESS(GetHeapAllocatableSize() >= map_key_size, settings::ResultSettingsItemKeyIteratorAllocationFailed());
/* Free the iterator's old map key. */ /* Free the iterator's old map key. */
FreeToHeap(out->map_key, out->entire_size); FreeToHeap(out->map_key, out->entire_size);

2
libstratosphere/source/settings/impl/settings_system_save_data.cpp
View File

@ -200,7 +200,7 @@ namespace ams::settings::impl {
s64 file_size = 0; s64 file_size = 0;
R_TRY(fs::GetFileSize(std::addressof(file_size), file)); R_TRY(fs::GetFileSize(std::addressof(file_size), file));
AMS_ASSERT(0 <= file_size && file_size <= static_cast<s64>(sizeof(m_buffer))); AMS_ASSERT(0 <= file_size && file_size <= static_cast<s64>(sizeof(m_buffer)));
R_UNLESS(file_size <= static_cast<s64>(sizeof(m_buffer)), ResultTooLargeSystemSaveData()); R_UNLESS(file_size <= static_cast<s64>(sizeof(m_buffer)), settings::ResultTooLargeSystemSaveData());
/* Read the save file. */ /* Read the save file. */
R_TRY(fs::ReadFile(file, 0, m_buffer, static_cast<size_t>(file_size))); R_TRY(fs::ReadFile(file, 0, m_buffer, static_cast<size_t>(file_size)));

18
libstratosphere/source/updater/updater_api.cpp
View File

@ -51,9 +51,9 @@ namespace ams::updater {
/* Implementations. */ /* Implementations. */
Result ValidateWorkBuffer(const void *work_buffer, size_t work_buffer_size) { Result ValidateWorkBuffer(const void *work_buffer, size_t work_buffer_size) {
R_UNLESS(work_buffer_size >= BctSize + EksSize, ResultTooSmallWorkBuffer()); R_UNLESS(work_buffer_size >= BctSize + EksSize, updater::ResultTooSmallWorkBuffer());
R_UNLESS(util::IsAligned(work_buffer, os::MemoryPageSize), ResultNotAlignedWorkBuffer()); R_UNLESS(util::IsAligned(work_buffer, os::MemoryPageSize), updater::ResultNotAlignedWorkBuffer());
R_UNLESS(util::IsAligned(work_buffer_size, 0x200), ResultNotAlignedWorkBuffer()); R_UNLESS(util::IsAligned(work_buffer_size, 0x200), updater::ResultNotAlignedWorkBuffer());
return ResultSuccess(); return ResultSuccess();
} }
@ -144,7 +144,7 @@ namespace ams::updater {
/* Mount the boot image package. */ /* Mount the boot image package. */
const char *mount_name = GetMountName(); const char *mount_name = GetMountName();
R_TRY_CATCH(fs::MountSystemData(mount_name, data_id)) { R_TRY_CATCH(fs::MountSystemData(mount_name, data_id)) {
R_CONVERT(fs::ResultTargetNotFound, ResultBootImagePackageNotFound()) R_CONVERT(fs::ResultTargetNotFound, updater::ResultBootImagePackageNotFound())
} R_END_TRY_CATCH; } R_END_TRY_CATCH;
ON_SCOPE_EXIT { fs::Unmount(mount_name); }; ON_SCOPE_EXIT { fs::Unmount(mount_name); };
@ -202,7 +202,7 @@ namespace ams::updater {
/* Mount the boot image package. */ /* Mount the boot image package. */
const char *mount_name = GetMountName(); const char *mount_name = GetMountName();
R_TRY_CATCH(fs::MountSystemData(mount_name, data_id)) { R_TRY_CATCH(fs::MountSystemData(mount_name, data_id)) {
R_CONVERT(fs::ResultTargetNotFound, ResultBootImagePackageNotFound()) R_CONVERT(fs::ResultTargetNotFound, updater::ResultBootImagePackageNotFound())
} R_END_TRY_CATCH; } R_END_TRY_CATCH;
ON_SCOPE_EXIT { fs::Unmount(mount_name); }; ON_SCOPE_EXIT { fs::Unmount(mount_name); };
@ -264,7 +264,7 @@ namespace ams::updater {
/* Mount the boot image package. */ /* Mount the boot image package. */
const char *mount_name = GetMountName(); const char *mount_name = GetMountName();
R_TRY_CATCH(fs::MountSystemData(mount_name, data_id)) { R_TRY_CATCH(fs::MountSystemData(mount_name, data_id)) {
R_CONVERT(fs::ResultTargetNotFound, ResultBootImagePackageNotFound()) R_CONVERT(fs::ResultTargetNotFound, updater::ResultBootImagePackageNotFound())
} R_END_TRY_CATCH; } R_END_TRY_CATCH;
ON_SCOPE_EXIT { fs::Unmount(mount_name); }; ON_SCOPE_EXIT { fs::Unmount(mount_name); };
@ -330,7 +330,7 @@ namespace ams::updater {
/* Mount the boot image package. */ /* Mount the boot image package. */
const char *mount_name = GetMountName(); const char *mount_name = GetMountName();
R_TRY_CATCH(fs::MountSystemData(mount_name, data_id)) { R_TRY_CATCH(fs::MountSystemData(mount_name, data_id)) {
R_CONVERT(fs::ResultTargetNotFound, ResultBootImagePackageNotFound()) R_CONVERT(fs::ResultTargetNotFound, updater::ResultBootImagePackageNotFound())
} R_END_TRY_CATCH; } R_END_TRY_CATCH;
ON_SCOPE_EXIT { fs::Unmount(mount_name); }; ON_SCOPE_EXIT { fs::Unmount(mount_name); };
@ -450,7 +450,7 @@ namespace ams::updater {
} }
Result CompareHash(const void *lhs, const void *rhs, size_t size) { Result CompareHash(const void *lhs, const void *rhs, size_t size) {
R_UNLESS(crypto::IsSameBytes(lhs, rhs, size), ResultNeedsRepairBootImages()); R_UNLESS(crypto::IsSameBytes(lhs, rhs, size), updater::ResultNeedsRepairBootImages());
return ResultSuccess(); return ResultSuccess();
} }
@ -493,7 +493,7 @@ namespace ams::updater {
const auto content_meta_type = GetContentMetaType(mode); const auto content_meta_type = GetContentMetaType(mode);
auto count = db.ListContentMeta(keys, MaxContentMetas, content_meta_type); auto count = db.ListContentMeta(keys, MaxContentMetas, content_meta_type);
R_UNLESS(count.total > 0, ResultBootImagePackageNotFound()); R_UNLESS(count.total > 0, updater::ResultBootImagePackageNotFound());
/* Output is sorted, return the lowest valid exfat entry. */ /* Output is sorted, return the lowest valid exfat entry. */
if (count.total > 1) { if (count.total > 1) {

2
libstratosphere/source/updater/updater_bis_management.cpp
View File

@ -72,7 +72,7 @@ namespace ams::updater {
fs::FileHandle file; fs::FileHandle file;
R_TRY_CATCH(fs::OpenFile(std::addressof(file), bip_path, fs::OpenMode_Read)) { R_TRY_CATCH(fs::OpenFile(std::addressof(file), bip_path, fs::OpenMode_Read)) {
R_CONVERT(fs::ResultPathNotFound, ResultInvalidBootImagePackage()) R_CONVERT(fs::ResultPathNotFound, updater::ResultInvalidBootImagePackage())
} R_END_TRY_CATCH; } R_END_TRY_CATCH;
ON_SCOPE_EXIT { fs::CloseFile(file); }; ON_SCOPE_EXIT { fs::CloseFile(file); };

4
libstratosphere/source/updater/updater_files.cpp
View File

@ -22,7 +22,7 @@ namespace ams::updater {
/* Open the file. */ /* Open the file. */
fs::FileHandle file; fs::FileHandle file;
R_TRY_CATCH(fs::OpenFile(std::addressof(file), path, fs::OpenMode_Read)) { R_TRY_CATCH(fs::OpenFile(std::addressof(file), path, fs::OpenMode_Read)) {
R_CONVERT(fs::ResultPathNotFound, ResultInvalidBootImagePackage()) R_CONVERT(fs::ResultPathNotFound, updater::ResultInvalidBootImagePackage())
} R_END_TRY_CATCH; } R_END_TRY_CATCH;
ON_SCOPE_EXIT { fs::CloseFile(file); }; ON_SCOPE_EXIT { fs::CloseFile(file); };
@ -34,7 +34,7 @@ namespace ams::updater {
/* Open the file. */ /* Open the file. */
fs::FileHandle file; fs::FileHandle file;
R_TRY_CATCH(fs::OpenFile(std::addressof(file), path, fs::OpenMode_Read)) { R_TRY_CATCH(fs::OpenFile(std::addressof(file), path, fs::OpenMode_Read)) {
R_CONVERT(fs::ResultPathNotFound, ResultInvalidBootImagePackage()) R_CONVERT(fs::ResultPathNotFound, updater::ResultInvalidBootImagePackage())
} R_END_TRY_CATCH; } R_END_TRY_CATCH;
ON_SCOPE_EXIT { fs::CloseFile(file); }; ON_SCOPE_EXIT { fs::CloseFile(file); };