ams: use R_SUCCEED, R_THROW globally

libraries/libstratosphere/source/kvdb/kvdb_archive.cpp

@@ -31,7 +31,7 @@ namespace ams::kvdb {
 
             Result Validate() const {
                 R_UNLESS(std::memcmp(this->magic, ArchiveHeaderMagic, sizeof(ArchiveHeaderMagic)) == 0, kvdb::ResultInvalidKeyValue());
-                return ResultSuccess();
+                R_SUCCEED();
             }
 
             static ArchiveHeader Make(size_t entry_count) {
@@ -50,7 +50,7 @@ namespace ams::kvdb {
 
             Result Validate() const {
                 R_UNLESS(std::memcmp(this->magic, ArchiveEntryMagic, sizeof(ArchiveEntryMagic)) == 0, kvdb::ResultInvalidKeyValue());
-                return ResultSuccess();
+                R_SUCCEED();
             }
 
             static ArchiveEntryHeader Make(size_t ksz, size_t vsz) {
@@ -72,13 +72,13 @@ namespace ams::kvdb {
         R_UNLESS(m_offset < m_offset + size,            kvdb::ResultInvalidKeyValue());
 
         std::memcpy(dst, m_buffer.Get() + m_offset, size);
-        return ResultSuccess();
+        R_SUCCEED();
     }
 
     Result ArchiveReader::Read(void *dst, size_t size) {
         R_TRY(this->Peek(dst, size));
         m_offset += size;
-        return ResultSuccess();
+        R_SUCCEED();
     }
 
     Result ArchiveReader::ReadEntryCount(size_t *out) {
@@ -91,7 +91,7 @@ namespace ams::kvdb {
         R_TRY(header.Validate());
 
         *out = header.entry_count;
-        return ResultSuccess();
+        R_SUCCEED();
     }
 
     Result ArchiveReader::GetEntrySize(size_t *out_key_size, size_t *out_value_size) {
@@ -105,7 +105,7 @@ namespace ams::kvdb {
 
         *out_key_size = header.key_size;
         *out_value_size = header.value_size;
-        return ResultSuccess();
+        R_SUCCEED();
     }
 
     Result ArchiveReader::ReadEntry(void *out_key, size_t key_size, void *out_value, size_t value_size) {
@@ -123,7 +123,7 @@ namespace ams::kvdb {
 
         R_ABORT_UNLESS(this->Read(out_key, key_size));
         R_ABORT_UNLESS(this->Read(out_value, value_size));
-        return ResultSuccess();
+        R_SUCCEED();
     }
 
     /* Writer functionality. */
@@ -134,7 +134,7 @@ namespace ams::kvdb {
 
         std::memcpy(m_buffer.Get() + m_offset, src, size);
         m_offset += size;
-        return ResultSuccess();
+        R_SUCCEED();
     }
 
     void ArchiveWriter::WriteHeader(size_t entry_count) {

libraries/libstratosphere/source/kvdb/kvdb_file_key_value_store.cpp

@@ -40,7 +40,7 @@ namespace ams::kvdb {
             R_UNLESS(m_entries != nullptr, kvdb::ResultBufferInsufficient());
         }
 
-        return ResultSuccess();
+        R_SUCCEED();
     }
 
     void FileKeyValueStore::Cache::Invalidate() {
@@ -170,7 +170,7 @@ namespace ams::kvdb {
         }
 
         *out_size = key_size;
-        return ResultSuccess();
+        R_SUCCEED();
     }
 
     Result FileKeyValueStore::Initialize(const char *dir) {
@@ -188,7 +188,7 @@ namespace ams::kvdb {
 
         /* Initialize our cache. */
         R_TRY(m_cache.Initialize(cache_buffer, cache_buffer_size, cache_capacity));
-        return ResultSuccess();
+        R_SUCCEED();
     }
 
     Result FileKeyValueStore::Get(size_t *out_size, void *out_value, size_t max_out_size, const void *key, size_t key_size) {
@@ -202,7 +202,7 @@ namespace ams::kvdb {
             auto size = m_cache.TryGet(out_value, max_out_size, key, key_size);
             if (size) {
                 *out_size = *size;
-                return ResultSuccess();
+                R_SUCCEED();
             }
         }
 
@@ -227,7 +227,7 @@ namespace ams::kvdb {
 
         /* Cache the newly read value. */
         m_cache.Set(key, key_size, out_value, value_size);
-        return ResultSuccess();
+        R_SUCCEED();
     }
 
     Result FileKeyValueStore::GetSize(size_t *out_size, const void *key, size_t key_size) {
@@ -241,7 +241,7 @@ namespace ams::kvdb {
             auto size = m_cache.TryGetSize(key, key_size);
             if (size) {
                 *out_size = *size;
-                return ResultSuccess();
+                R_SUCCEED();
             }
         }
 
@@ -257,7 +257,7 @@ namespace ams::kvdb {
         R_TRY(fs::GetFileSize(std::addressof(file_size), file));
 
         *out_size = static_cast<size_t>(file_size);
-        return ResultSuccess();
+        R_SUCCEED();
     }
 
     Result FileKeyValueStore::Set(const void *key, size_t key_size, const void *value, size_t value_size) {
@@ -286,7 +286,7 @@ namespace ams::kvdb {
         /* Write the value file and flush. */
         R_TRY(fs::WriteFile(file, 0, value, value_size, fs::WriteOption::Flush));
 
-        return ResultSuccess();
+        R_SUCCEED();
     }
 
     Result FileKeyValueStore::Remove(const void *key, size_t key_size) {
@@ -305,7 +305,7 @@ namespace ams::kvdb {
             R_CONVERT(fs::ResultPathNotFound, kvdb::ResultKeyNotFound())
         } R_END_TRY_CATCH;
 
-        return ResultSuccess();
+        R_SUCCEED();
     }
 
 }