Various fixes. Note: This contains debug stuff which will be removed later. I was getting tired of having to cherrypick tiny changes

stratosphere/ncm/source/ncm_content_manager_service.cpp

@@ -17,6 +17,8 @@
 #include "impl/ncm_content_manager.hpp"
 #include "ncm_content_manager_service.hpp"
 
+#include "debug.hpp"
+
 namespace sts::ncm {
 
     ContentManagerService::~ContentManagerService() {
@@ -24,61 +26,87 @@ namespace sts::ncm {
     }
 
     Result ContentManagerService::CreateContentStorage(StorageId storage_id) {
+        R_DEBUG_START
         return impl::CreateContentStorage(storage_id);
+        R_DEBUG_END
     }
 
     Result ContentManagerService::CreateContentMetaDatabase(StorageId storage_id) {
+        R_DEBUG_START
         return impl::CreateContentMetaDatabase(storage_id);
+        R_DEBUG_END
     }
 
     Result ContentManagerService::VerifyContentStorage(StorageId storage_id) {
+        R_DEBUG_START
         return impl::VerifyContentStorage(storage_id);
+        R_DEBUG_END
     }
 
     Result ContentManagerService::VerifyContentMetaDatabase(StorageId storage_id) {
+        R_DEBUG_START
         return impl::VerifyContentMetaDatabase(storage_id);
+        R_DEBUG_END
     }
 
     Result ContentManagerService::OpenContentStorage(Out<std::shared_ptr<IContentStorage>> out, StorageId storage_id) {
+        R_DEBUG_START
         std::shared_ptr<IContentStorage> content_storage;
         R_TRY(impl::OpenContentStorage(&content_storage, storage_id));
         out.SetValue(std::move(content_storage));
         return ResultSuccess;
+        R_DEBUG_END
     }
 
     Result ContentManagerService::OpenContentMetaDatabase(Out<std::shared_ptr<IContentMetaDatabase>> out, StorageId storage_id) {
+        R_DEBUG_START
         std::shared_ptr<IContentMetaDatabase> content_meta_database;
         R_TRY(impl::OpenContentMetaDatabase(&content_meta_database, storage_id));
         out.SetValue(std::move(content_meta_database));
         return ResultSuccess;
+        R_DEBUG_END
     }
 
     Result ContentManagerService::CloseContentStorageForcibly(StorageId storage_id) {
+        R_DEBUG_START
         return impl::CloseContentStorageForcibly(storage_id);
+        R_DEBUG_END
     }
 
     Result ContentManagerService::CloseContentMetaDatabaseForcibly(StorageId storage_id) {
+        R_DEBUG_START
         return impl::CloseContentMetaDatabaseForcibly(storage_id);
+        R_DEBUG_END
     }
 
     Result ContentManagerService::CleanupContentMetaDatabase(StorageId storage_id) {
+        R_DEBUG_START
         return impl::CleanupContentMetaDatabase(storage_id);
+        R_DEBUG_END
     }
 
     Result ContentManagerService::ActivateContentStorage(StorageId storage_id) {
+        R_DEBUG_START
         return impl::ActivateContentStorage(storage_id);
+        R_DEBUG_END
     }
 
     Result ContentManagerService::InactivateContentStorage(StorageId storage_id) {
+        R_DEBUG_START
         return impl::InactivateContentStorage(storage_id);
+        R_DEBUG_END
     }
 
     Result ContentManagerService::ActivateContentMetaDatabase(StorageId storage_id) {
+        R_DEBUG_START
         return impl::ActivateContentMetaDatabase(storage_id);
+        R_DEBUG_END
     }
 
     Result ContentManagerService::InactivateContentMetaDatabase(StorageId storage_id) {
+        R_DEBUG_START
         return impl::InactivateContentMetaDatabase(storage_id);
+        R_DEBUG_END
     }
 
 }