Modernize C++ usage (#144)

* Stratosphere: Use modern C++ idioms in some places

* algorithms like std::for_each are used instead of raw loops

* Stratosphere: Replace more raw loops with algorithms

* Stratosphere: Add a utility predicate function to test for equality with a reference element

This can be used to rewrite some common raw loops using algorithms instead

* fs.mitm: Use variant

* fs.mitm: Use enum class

* fs.mitm: Turn RomFSSourceInfo::Cleanup into a destructor

This obsoletes the need for a custom deleter in other places

* fs.mitm: Use enum class some more

* fs.mitm: Use unique_ptr

* fs.mitm: Simplify initialization

* Stratosphere: Simplify initialization

* fs.mitm: Use unique_ptr (fix memory leak along the way)

The previous code was using "delete" rather than "delete[]"

* fs.mitm: Use vector::emplace_back rather than push_back

emplace_back constructs elements in-place, hence avoiding a redundant element copy.

* Stratosphere: Replace more raw loops with algorithms

* Stratosphere: Use unique_ptr

* fs.mitm: Replace more raw loops with algorithms

* Stratosphere: Prefer move-construction over copy-construction when moving sink parameters around

stratosphere/fs_mitm/source/fs_istorage.hpp

@@ -5,13 +5,13 @@
 
 #include "debug.hpp"
 
-enum FsIStorageCmd {
-    FsIStorage_Cmd_Read = 0,
-    FsIStorage_Cmd_Write = 1,
-    FsIStorage_Cmd_Flush = 2,
-    FsIStorage_Cmd_SetSize = 3,
-    FsIStorage_Cmd_GetSize = 4,
-    FsIStorage_Cmd_OperateRange = 5,
+enum class FsIStorageCmd {
+    Read = 0,
+    Write = 1,
+    Flush = 2,
+    SetSize = 3,
+    GetSize = 4,
+    OperateRange = 5,
 };
 
 class IStorage {
@@ -49,22 +49,22 @@ class IStorageInterface : public IServiceObject {
         Result dispatch(IpcParsedCommand &r, IpcCommand &out_c, u64 cmd_id, u8 *pointer_buffer, size_t pointer_buffer_size) final {
             Result rc = 0xF601;
             switch ((FsIStorageCmd)cmd_id) {
-                case FsIStorage_Cmd_Read:
+                case FsIStorageCmd::Read:
                     rc = WrapIpcCommandImpl<&IStorageInterface::read>(this, r, out_c, pointer_buffer, pointer_buffer_size);
                     break;
-                case FsIStorage_Cmd_Write:
+                case FsIStorageCmd::Write:
                     rc = WrapIpcCommandImpl<&IStorageInterface::write>(this, r, out_c, pointer_buffer, pointer_buffer_size);
                     break;
-                case FsIStorage_Cmd_Flush:
+                case FsIStorageCmd::Flush:
                     rc = WrapIpcCommandImpl<&IStorageInterface::flush>(this, r, out_c, pointer_buffer, pointer_buffer_size);
                     break;
-                case FsIStorage_Cmd_SetSize:
+                case FsIStorageCmd::SetSize:
                     rc = WrapIpcCommandImpl<&IStorageInterface::set_size>(this, r, out_c, pointer_buffer, pointer_buffer_size);
                     break;
-                case FsIStorage_Cmd_GetSize:
+                case FsIStorageCmd::GetSize:
                     rc = WrapIpcCommandImpl<&IStorageInterface::get_size>(this, r, out_c, pointer_buffer, pointer_buffer_size);
                     break;
-                case FsIStorage_Cmd_OperateRange:
+                case FsIStorageCmd::OperateRange:
                     if (kernelAbove400()) {
                         rc = WrapIpcCommandImpl<&IStorageInterface::operate_range>(this, r, out_c, pointer_buffer, pointer_buffer_size);
                     }

stratosphere/fs_mitm/source/fsmitm_layeredrom.cpp

@@ -9,28 +9,19 @@
 LayeredRomFS::LayeredRomFS(std::shared_ptr<RomInterfaceStorage> s_r, std::shared_ptr<RomFileStorage> f_r, u64 tid) : storage_romfs(s_r), file_romfs(f_r), title_id(tid) {
     /* Start building the new virtual romfs. */
     RomFSBuildContext build_ctx(this->title_id);
-    this->p_source_infos = std::shared_ptr<std::vector<RomFSSourceInfo>>(new std::vector<RomFSSourceInfo>(), [](std::vector<RomFSSourceInfo> *to_delete) {
-        for (unsigned int i = 0; i < to_delete->size(); i++) {
-            (*to_delete)[i].Cleanup();
-        }
-        delete to_delete;
-    });
+    this->p_source_infos = std::make_shared<std::vector<RomFSSourceInfo>>();
     if (Utils::IsSdInitialized()) {
         build_ctx.MergeSdFiles();
     }
     if (this->file_romfs) {
-        build_ctx.MergeRomStorage(this->file_romfs.get(), RomFSDataSource_FileRomFS);
+        build_ctx.MergeRomStorage(this->file_romfs.get(), RomFSDataSource::FileRomFS);
     }
     if (this->storage_romfs) {
-        build_ctx.MergeRomStorage(this->storage_romfs.get(), RomFSDataSource_BaseRomFS);
+        build_ctx.MergeRomStorage(this->storage_romfs.get(), RomFSDataSource::BaseRomFS);
     }
     build_ctx.Build(this->p_source_infos.get());
 }
 
-LayeredRomFS::~LayeredRomFS() {
-    /* ... */
-}
-
 
 Result LayeredRomFS::Read(void *buffer, size_t size, u64 offset)  {
     /* Validate size. */
@@ -60,7 +51,6 @@ Result LayeredRomFS::Read(void *buffer, size_t size, u64 offset)  {
         }
     }
     
-    Result rc;
     size_t read_so_far = 0;
     while (read_so_far < size) {
         RomFSSourceInfo *cur_source = &((*this->p_source_infos)[cur_source_ind]);
@@ -69,47 +59,38 @@ Result LayeredRomFS::Read(void *buffer, size_t size, u64 offset)  {
             if (cur_read_size > cur_source->size - (offset - cur_source->virtual_offset)) {
                 cur_read_size = cur_source->size - (offset - cur_source->virtual_offset);
             }
-            switch (cur_source->type) {
-                case RomFSDataSource_LooseFile:
-                    {
-                        FsFile file;
-                        if (R_FAILED((rc = Utils::OpenRomFSSdFile(this->title_id, cur_source->loose_source_info.path, FS_OPEN_READ, &file)))) {
-                            fatalSimple(rc);
-                        }
-                        size_t out_read;
-                        if (R_FAILED((rc = fsFileRead(&file, (offset - cur_source->virtual_offset), (void *)((uintptr_t)buffer + read_so_far), cur_read_size, &out_read)))) {
-                            fatalSimple(rc);
-                        }
-                        if (out_read != cur_read_size) {
-                            Reboot();
-                        }
-                        fsFileClose(&file);
+            auto source_info_visitor = [&](auto& info) -> Result {
+                Result rc = 0;
+                if constexpr (std::is_same_v<decltype(info), RomFSBaseSourceInfo>) {
+                    FsFile file;
+                    if (R_FAILED((rc = Utils::OpenRomFSSdFile(this->title_id, info.path, FS_OPEN_READ, &file)))) {
+                        fatalSimple(rc);
                     }
-                    break;
-                case RomFSDataSource_Memory:
-                    {
-                        memcpy((void *)((uintptr_t)buffer + read_so_far), cur_source->memory_source_info.data + (offset - cur_source->virtual_offset), cur_read_size);
+                    size_t out_read;
+                    if (R_FAILED((rc = fsFileRead(&file, (offset - cur_source->virtual_offset), (void *)((uintptr_t)buffer + read_so_far), cur_read_size, &out_read)))) {
+                        fatalSimple(rc);
                     }
-                    break;
-                case RomFSDataSource_BaseRomFS:
-                    {
-                        if (R_FAILED((rc = this->storage_romfs->Read((void *)((uintptr_t)buffer + read_so_far), cur_read_size, cur_source->base_source_info.offset + (offset - cur_source->virtual_offset))))) {
-                            /* TODO: Can this ever happen? */
-                            /* fatalSimple(rc); */
-                            return rc;
-                        }
+                    if (out_read != cur_read_size) {
+                        Reboot();
                     }
-                    break;
-                case RomFSDataSource_FileRomFS:
-                    {
-                        if (R_FAILED((rc = this->file_romfs->Read((void *)((uintptr_t)buffer + read_so_far), cur_read_size, cur_source->base_source_info.offset + (offset - cur_source->virtual_offset))))) {
-                            fatalSimple(rc);
-                        }
+                    fsFileClose(&file);
+                } else if constexpr (std::is_same_v<decltype(info), RomFSFileSourceInfo>) {
+                    memcpy((void *)((uintptr_t)buffer + read_so_far), info.data + (offset - cur_source->virtual_offset), cur_read_size);
+                } else if constexpr (std::is_same_v<decltype(info), RomFSLooseSourceInfo>) {
+                    if (R_FAILED((rc = this->storage_romfs->Read((void *)((uintptr_t)buffer + read_so_far), cur_read_size, info.offset + (offset - cur_source->virtual_offset))))) {
+                        /* TODO: Can this ever happen? */
+                        /* fatalSimple(rc); */
+                        return rc;
                     }
-                    break;
-                default:
-                    fatalSimple(0xF601);
-            }
+                } else if constexpr (std::is_same_v<decltype(info), RomFSMemorySourceInfo>) {
+                    if (R_FAILED((rc = this->file_romfs->Read((void *)((uintptr_t)buffer + read_so_far), cur_read_size, info.offset + (offset - cur_source->virtual_offset))))) {
+                        fatalSimple(rc);
+                    }
+                }
+                return rc;
+            };
+            Result rc = std::visit(source_info_visitor, cur_source->info);
+
             read_so_far += cur_read_size;
         } else {
             /* Handle padding explicitly. */
@@ -132,4 +113,4 @@ Result LayeredRomFS::OperateRange(u32 operation_type, u64 offset, u64 size, FsRa
         *out_range_info = {0};
     }
     return 0;
-}
+}

stratosphere/fs_mitm/source/fsmitm_layeredrom.hpp

@@ -23,7 +23,7 @@ class LayeredRomFS : public IROStorage {
                 
     public:
         LayeredRomFS(std::shared_ptr<RomInterfaceStorage> s_r, std::shared_ptr<RomFileStorage> f_r, u64 tid);
-        virtual ~LayeredRomFS();
+        virtual ~LayeredRomFS() = default;
         
         Result Read(void *buffer, size_t size, u64 offset) override;
         Result GetSize(u64 *out_size) override;

stratosphere/fs_mitm/source/fsmitm_main.cpp

@@ -99,8 +99,8 @@ int main(int argc, char **argv)
     }
     
     /* TODO: What's a good timeout value to use here? */
-    MultiThreadedWaitableManager *server_manager = new MultiThreadedWaitableManager(1, U64_MAX, 0x20000);
-    //WaitableManager *server_manager = new WaitableManager(U64_MAX);
+    auto server_manager = std::make_unique<MultiThreadedWaitableManager>(1, U64_MAX, 0x20000);
+    //auto server_manager = std::make_unique<WaitableManager>(U64_MAX);
         
     /* Create fsp-srv mitm. */
     ISession<MitMQueryService<FsMitMService>> *fs_query_srv = NULL;
@@ -110,9 +110,7 @@ int main(int argc, char **argv)
             
     /* Loop forever, servicing our services. */
     server_manager->process();
-    
-    /* Cleanup. */
-    delete server_manager;
-	return 0;
+
+    return 0;
 }
 

stratosphere/fs_mitm/source/fsmitm_romfsbuild.cpp

@@ -77,7 +77,7 @@ void RomFSBuildContext::MergeSdFiles() {
     if (R_FAILED(fsMountSdcard(&sd_filesystem))) {
         return;
     }
-    this->cur_source_type = RomFSDataSource_LooseFile;
+    this->cur_source_type = RomFSDataSource::LooseFile;
     this->VisitDirectory(&sd_filesystem, this->root);
     fsFsClose(&sd_filesystem);
 }
@@ -158,19 +158,17 @@ void RomFSBuildContext::MergeRomStorage(IROStorage *storage, RomFSDataSource sou
     }
     
     /* Read tables. */
-    u8 *dir_table = new u8[header.dir_table_size];
-    u8 *file_table = new u8[header.file_table_size];
-    if (R_FAILED((rc = storage->Read(dir_table, header.dir_table_size, header.dir_table_ofs)))) {
+    auto dir_table = std::make_unique<u8[]>(header.dir_table_size);
+    auto file_table = std::make_unique<u8[]>(header.file_table_size);
+    if (R_FAILED((rc = storage->Read(dir_table.get(), header.dir_table_size, header.dir_table_ofs)))) {
         fatalSimple(rc);
     }
-    if (R_FAILED((rc = storage->Read(file_table, header.file_table_size, header.file_table_ofs)))) {
+    if (R_FAILED((rc = storage->Read(file_table.get(), header.file_table_size, header.file_table_ofs)))) {
         fatalSimple(rc);
     }
     
     this->cur_source_type = source;
-    this->VisitDirectory(this->root, 0x0, dir_table, (size_t)header.dir_table_size, file_table, (size_t)header.file_table_size);
-    delete dir_table;
-    delete file_table;
+    this->VisitDirectory(this->root, 0x0, dir_table.get(), (size_t)header.dir_table_size, file_table.get(), (size_t)header.file_table_size);
 }
 
 bool RomFSBuildContext::AddDirectory(RomFSBuildDirectoryContext *parent_dir_ctx, RomFSBuildDirectoryContext *dir_ctx, RomFSBuildDirectoryContext **out_dir_ctx) {    
@@ -310,7 +308,7 @@ void RomFSBuildContext::Build(std::vector<RomFSSourceInfo> *out_infos) {
     }
     
     out_infos->clear();
-    out_infos->push_back(RomFSSourceInfo(0, sizeof(*header), header, RomFSDataSource_Memory));
+    out_infos->emplace_back(0, sizeof(*header), header, RomFSDataSource::Memory);
         
     /* Determine file offsets. */
     cur_file = this->files;
@@ -356,20 +354,20 @@ void RomFSBuildContext::Build(std::vector<RomFSSourceInfo> *out_infos) {
         
         
         switch (cur_file->source) {
-            case RomFSDataSource_BaseRomFS:
-            case RomFSDataSource_FileRomFS:
+            case RomFSDataSource::BaseRomFS:
+            case RomFSDataSource::FileRomFS:
                 /* Try to compact, if possible. */
-                if (out_infos->back().type == cur_file->source) {
+                if (out_infos->back().GetType() == cur_file->source) {
                     out_infos->back().size = cur_file->offset + ROMFS_FILEPARTITION_OFS + cur_file->size - out_infos->back().virtual_offset;
                 } else {
-                    out_infos->push_back(RomFSSourceInfo(cur_file->offset + ROMFS_FILEPARTITION_OFS, cur_file->size, cur_file->orig_offset + ROMFS_FILEPARTITION_OFS, cur_file->source));
+                    out_infos->emplace_back(cur_file->offset + ROMFS_FILEPARTITION_OFS, cur_file->size, cur_file->orig_offset + ROMFS_FILEPARTITION_OFS, cur_file->source);
                 }
                 break;
-            case RomFSDataSource_LooseFile: 
+            case RomFSDataSource::LooseFile:
                 {
                     char *path = new char[cur_file->path_len + 1];
                     strcpy(path, cur_file->path);
-                    out_infos->push_back(RomFSSourceInfo(cur_file->offset + ROMFS_FILEPARTITION_OFS, cur_file->size, path, cur_file->source));
+                    out_infos->emplace_back(cur_file->offset + ROMFS_FILEPARTITION_OFS, cur_file->size, path, cur_file->source);
                 }
                 break;
             default:
@@ -416,5 +414,5 @@ void RomFSBuildContext::Build(std::vector<RomFSSourceInfo> *out_infos) {
     header->file_hash_table_ofs = header->dir_table_ofs + header->dir_table_size;
     header->file_table_ofs = header->file_hash_table_ofs + header->file_hash_table_size;
     
-    out_infos->push_back(RomFSSourceInfo(header->dir_hash_table_ofs, this->dir_hash_table_size + this->dir_table_size + this->file_hash_table_size + this->file_table_size, metadata, RomFSDataSource_Memory));
-}
+    out_infos->emplace_back(header->dir_hash_table_ofs, this->dir_hash_table_size + this->dir_table_size + this->file_hash_table_size + this->file_table_size, metadata, RomFSDataSource::Memory);
+}

stratosphere/fs_mitm/source/fsmitm_romfsbuild.hpp

@@ -1,5 +1,6 @@
 #pragma once
 #include <switch.h>
+#include <variant>
 
 #include "fsmitm_romstorage.hpp"
 
@@ -7,11 +8,11 @@
 #define ROMFS_FILEPARTITION_OFS 0x200
 
 /* Types for RomFS Meta construction. */
-enum RomFSDataSource {
-    RomFSDataSource_BaseRomFS,
-    RomFSDataSource_FileRomFS,
-    RomFSDataSource_LooseFile,
-    RomFSDataSource_Memory,
+enum class RomFSDataSource {
+    BaseRomFS,
+    FileRomFS,
+    LooseFile,
+    Memory,
 };
 
 struct RomFSBaseSourceInfo {
@@ -30,66 +31,92 @@ struct RomFSMemorySourceInfo {
     const u8 *data;
 };
 
-struct RomFSSourceInfo {
+class RomFSSourceInfo {
+    using InfoVariant = std::variant<RomFSBaseSourceInfo, RomFSFileSourceInfo, RomFSLooseSourceInfo, RomFSMemorySourceInfo>;
+
+    static InfoVariant MakeInfoVariantFromOffset(u64 offset, RomFSDataSource t) {
+        switch(t) {
+            case RomFSDataSource::BaseRomFS:
+                return RomFSBaseSourceInfo { offset };
+
+            case RomFSDataSource::FileRomFS:
+                return RomFSFileSourceInfo { offset };
+
+            default:
+                fatalSimple(0xF601);
+        }
+    }
+
+    static InfoVariant MakeInfoVariantFromPointer(const void *arg, RomFSDataSource t) {
+        switch(t) {
+            case RomFSDataSource::LooseFile:
+                return RomFSLooseSourceInfo { (decltype(RomFSLooseSourceInfo::path))arg };
+
+            case RomFSDataSource::Memory:
+                return RomFSMemorySourceInfo { (decltype(RomFSMemorySourceInfo::data))arg };
+
+            default:
+                fatalSimple(0xF601);
+        }
+    }
+
+    struct InfoCleanupHelper {
+        void operator()(RomFSBaseSourceInfo& info) {
+        }
+
+        void operator()(RomFSFileSourceInfo& info) {
+        }
+
+        void operator()(RomFSLooseSourceInfo& info) {
+            delete info.path;
+        }
+
+        void operator()(RomFSMemorySourceInfo& info) {
+            delete info.data;
+        }
+    };
+
+    struct GetTypeHelper {
+        RomFSDataSource operator()(const RomFSBaseSourceInfo& info) const {
+            return RomFSDataSource::BaseRomFS;
+        }
+
+        RomFSDataSource operator()(const RomFSFileSourceInfo& info) const {
+            return RomFSDataSource::FileRomFS;
+        }
+
+        RomFSDataSource operator()(const RomFSLooseSourceInfo& info) const {
+            return RomFSDataSource::LooseFile;
+        }
+
+        RomFSDataSource operator()(const RomFSMemorySourceInfo& info) const {
+            return RomFSDataSource::Memory;
+        }
+    };
+
+public:
     u64 virtual_offset;
     u64 size;
-    union {
-        RomFSBaseSourceInfo base_source_info;
-        RomFSFileSourceInfo file_source_info;
-        RomFSLooseSourceInfo loose_source_info;
-        RomFSMemorySourceInfo memory_source_info;
-    };
-    RomFSDataSource type;
-    
-    RomFSSourceInfo(u64 v_o, u64 s, u64 offset, RomFSDataSource t) : virtual_offset(v_o), size(s), type(t) {
-        switch (this->type) {
-            case RomFSDataSource_BaseRomFS:
-                this->base_source_info.offset = offset;
-                break;
-            case RomFSDataSource_FileRomFS:
-                this->file_source_info.offset = offset;
-                break;
-            case RomFSDataSource_LooseFile:
-            case RomFSDataSource_Memory:
-            default:
-                fatalSimple(0xF601);
-        }
+
+    InfoVariant info;
+
+    RomFSSourceInfo(u64 v_o, u64 s, u64 offset, RomFSDataSource t) : virtual_offset(v_o), size(s), info(MakeInfoVariantFromOffset(offset, t)) {
     }
-    
-    RomFSSourceInfo(u64 v_o, u64 s, const void *arg, RomFSDataSource t) : virtual_offset(v_o), size(s), type(t) {
-        switch (this->type) {
-            case RomFSDataSource_LooseFile:
-                this->loose_source_info.path = (decltype(this->loose_source_info.path))arg;
-                break;
-            case RomFSDataSource_Memory:
-                this->memory_source_info.data = (decltype(this->memory_source_info.data))arg;
-                break;
-            case RomFSDataSource_BaseRomFS:
-            case RomFSDataSource_FileRomFS:
-            default:
-                fatalSimple(0xF601);
-        }
+
+    RomFSSourceInfo(u64 v_o, u64 s, const void *arg, RomFSDataSource t) : virtual_offset(v_o), size(s), info(MakeInfoVariantFromPointer(arg, t)) {
     }
-    
-    void Cleanup() {
-        switch (this->type) {
-            case RomFSDataSource_BaseRomFS:
-            case RomFSDataSource_FileRomFS:
-                break;
-            case RomFSDataSource_LooseFile:
-                delete this->loose_source_info.path;
-                break;
-            case RomFSDataSource_Memory:
-                delete this->memory_source_info.data;
-                break;
-            default:
-                fatalSimple(0xF601);
-        }
+
+    ~RomFSSourceInfo() {
+        std::visit(InfoCleanupHelper{}, info);
     }
-    
+
     static bool Compare(RomFSSourceInfo *a, RomFSSourceInfo *b) {
         return (a->virtual_offset < b->virtual_offset);
     }
+
+    RomFSDataSource GetType() const {
+        return std::visit(GetTypeHelper{}, info);
+    }
 };
 
 /* Types for building a RomFS. */

stratosphere/fs_mitm/source/fsmitm_service.cpp

@@ -13,16 +13,18 @@
 Result FsMitMService::dispatch(IpcParsedCommand &r, IpcCommand &out_c, u64 cmd_id, u8 *pointer_buffer, size_t pointer_buffer_size) {
     Result rc = 0xF601;
     if (this->has_initialized) {
-        switch (cmd_id) {
-            case FspSrv_Cmd_OpenDataStorageByCurrentProcess:
+        switch (static_cast<FspSrvCmd>(cmd_id)) {
+            case FspSrvCmd::OpenDataStorageByCurrentProcess:
                 rc = WrapIpcCommandImpl<&FsMitMService::open_data_storage_by_current_process>(this, r, out_c, pointer_buffer, pointer_buffer_size);
                 break;
-            case FspSrv_Cmd_OpenDataStorageByDataId:
+            case FspSrvCmd::OpenDataStorageByDataId:
                 rc = WrapIpcCommandImpl<&FsMitMService::open_data_storage_by_data_id>(this, r, out_c, pointer_buffer, pointer_buffer_size);
                 break;
+            default:
+                break;
         }
     } else {
-        if (cmd_id == FspSrv_Cmd_SetCurrentProcess) {
+        if (static_cast<FspSrvCmd>(cmd_id) == FspSrvCmd::SetCurrentProcess) {
             if (r.HasPid) {
                 this->init_pid = r.Pid;
             }
@@ -38,14 +40,12 @@ void FsMitMService::postprocess(IpcParsedCommand &r, IpcCommand &out_c, u64 cmd_
     } *resp = (decltype(resp))r.Raw;
     
     u64 *tls = (u64 *)armGetTls();
-    u64 backup_tls[0x100/sizeof(u64)];
-    for (unsigned int i = 0; i < sizeof(backup_tls)/sizeof(u64); i++) {
-        backup_tls[i] = tls[i];
-    }
+    std::array<u64, 0x100/sizeof(u64)> backup_tls;
+    std::copy(tls, tls + backup_tls.size(), backup_tls.begin());
     
     Result rc = (Result)resp->result;
-    switch (cmd_id) {
-        case FspSrv_Cmd_SetCurrentProcess:
+    switch (static_cast<FspSrvCmd>(cmd_id)) {
+        case FspSrvCmd::SetCurrentProcess:
             if (R_SUCCEEDED(rc)) {
                 this->has_initialized = true;
             }
@@ -54,9 +54,9 @@ void FsMitMService::postprocess(IpcParsedCommand &r, IpcCommand &out_c, u64 cmd_
             if (R_FAILED(MitMQueryUtils::get_associated_tid_for_pid(this->process_id, &this->title_id))) {
                 /* Log here, if desired. */
             }
-            for (unsigned int i = 0; i < sizeof(backup_tls)/sizeof(u64); i++) {
-                tls[i] = backup_tls[i];
-            }
+            std::copy(backup_tls.begin(), backup_tls.end(), tls);
+            break;
+        default:
             break;
     }
     resp->result = rc;

stratosphere/fs_mitm/source/fsmitm_service.hpp

@@ -4,10 +4,10 @@
 #include "imitmserviceobject.hpp"
 #include "fs_istorage.hpp"
 
-enum FspSrvCmd {
-    FspSrv_Cmd_SetCurrentProcess = 1,
-    FspSrv_Cmd_OpenDataStorageByCurrentProcess = 200,
-    FspSrv_Cmd_OpenDataStorageByDataId = 202,
+enum class FspSrvCmd {
+    SetCurrentProcess = 1,
+    OpenDataStorageByCurrentProcess = 200,
+    OpenDataStorageByDataId = 202,
 };
 
 class FsMitMService : public IMitMServiceObject {      
@@ -43,4 +43,4 @@ class FsMitMService : public IMitMServiceObject {
         /* Overridden commands. */
         std::tuple<Result, OutSession<IStorageInterface>> open_data_storage_by_current_process();
         std::tuple<Result, OutSession<IStorageInterface>> open_data_storage_by_data_id(u64 storage_id, u64 data_id);
-};
+};

stratosphere/fs_mitm/source/fsmitm_worker.cpp

@@ -7,7 +7,7 @@ static SystemEvent *g_new_waitable_event = NULL;
 static HosMutex g_new_waitable_mutex;
 static HosSemaphore g_sema_new_waitable_finish;
 
-static WaitableManager *g_worker_waiter = NULL;
+static std::unique_ptr<WaitableManager> g_worker_waiter;
 
 Result FsMitMWorker::AddWaitableCallback(void *arg, Handle *handles, size_t num_handles, u64 timeout) {
     (void)arg;
@@ -29,11 +29,9 @@ void FsMitMWorker::Main(void *arg) {
     g_new_waitable_event = new SystemEvent(NULL, &FsMitMWorker::AddWaitableCallback);
 
     /* Make a new waitable manager. */
-    g_worker_waiter = new WaitableManager(U64_MAX);
+    g_worker_waiter = std::make_unique<WaitableManager>(U64_MAX);
     g_worker_waiter->add_waitable(g_new_waitable_event);
     
     /* Service processes. */
     g_worker_waiter->process();
-    
-    delete g_worker_waiter;
 }

stratosphere/fs_mitm/source/imitmserviceobject.hpp

@@ -9,10 +9,10 @@
 class IMitMServiceObject : public IServiceObject {
     protected:
         Service *forward_service;
-        u64 process_id;
-        u64 title_id;
+        u64 process_id = 0;
+        u64 title_id = 0;
     public:
-        IMitMServiceObject(Service *s) : forward_service(s), process_id(0), title_id(0) {
+        IMitMServiceObject(Service *s) : forward_service(s) {
             
         }
         
@@ -22,7 +22,7 @@ class IMitMServiceObject : public IServiceObject {
                 
         virtual void clone_to(void *o) = 0;
     protected:
-        virtual ~IMitMServiceObject() { }
+        virtual ~IMitMServiceObject() = default;
         virtual Result dispatch(IpcParsedCommand &r, IpcCommand &out_c, u64 cmd_id, u8 *pointer_buffer, size_t pointer_buffer_size) = 0;
         virtual void postprocess(IpcParsedCommand &r, IpcCommand &out_c, u64 cmd_id, u8 *pointer_buffer, size_t pointer_buffer_size) = 0;
         virtual Result handle_deferred() = 0;

stratosphere/fs_mitm/source/mitm_session.hpp

@@ -19,33 +19,35 @@ class MitMSession final : public ISession<T> {
     /* This will be for the actual session. */
     Service forward_service;
     IpcParsedCommand cur_out_r;
-    u32 mitm_domain_id;
+    u32 mitm_domain_id = 0;
     bool got_first_message;
         
     public:
-        MitMSession<T>(MitMServer<T> *s, Handle s_h, Handle c_h, const char *srv) : ISession<T>(s, s_h, c_h, NULL, 0), mitm_domain_id(0), got_first_message(false) {
+        MitMSession<T>(MitMServer<T> *s, Handle s_h, Handle c_h, const char *srv) : ISession<T>(s, s_h, c_h, NULL, 0), got_first_message(false) {
             this->server = s;
             this->server_handle = s_h;
             this->client_handle = c_h;
             if (R_FAILED(smMitMGetService(&forward_service, srv))) {
                 /* TODO: Panic. */
             }
-            if (R_FAILED(ipcQueryPointerBufferSize(forward_service.handle, &this->pointer_buffer_size))) {
+            size_t pointer_buffer_size = 0;
+            if (R_FAILED(ipcQueryPointerBufferSize(forward_service.handle, &pointer_buffer_size))) {
                 /* TODO: Panic. */
             }
             this->service_object = std::make_shared<T>(&forward_service);
-            this->pointer_buffer = new char[this->pointer_buffer_size];
+            this->pointer_buffer.resize(pointer_buffer_size);
         }
-        MitMSession<T>(MitMServer<T> *s, Handle s_h, Handle c_h, Handle f_h) : ISession<T>(s, s_h, c_h, NULL, 0), mitm_domain_id(0), got_first_message(true) {
+        MitMSession<T>(MitMServer<T> *s, Handle s_h, Handle c_h, Handle f_h) : ISession<T>(s, s_h, c_h, NULL, 0), got_first_message(true) {
             this->server = s;
             this->server_handle = s_h;
             this->client_handle = c_h;
             serviceCreate(&this->forward_service, f_h);
-            if (R_FAILED(ipcQueryPointerBufferSize(forward_service.handle, &this->pointer_buffer_size))) {
+            size_t pointer_buffer_size = 0;
+            if (R_FAILED(ipcQueryPointerBufferSize(forward_service.handle, &pointer_buffer_size))) {
                 /* TODO: Panic. */
             }
             this->service_object = std::make_shared<T>(&forward_service);
-            this->pointer_buffer = new char[this->pointer_buffer_size];
+            this->pointer_buffer.resize(pointer_buffer_size);
         }
         
         virtual ~MitMSession() {
@@ -92,7 +94,7 @@ class MitMSession final : public ISession<T> {
                     obj = this->service_object;
                 }
                 if (obj != nullptr) {
-                    retval = obj->dispatch(r, c, cmd_id, (u8 *)this->pointer_buffer, this->pointer_buffer_size);
+                    retval = obj->dispatch(r, c, cmd_id, (u8 *)this->pointer_buffer.data(), this->pointer_buffer.size());
                     if (R_SUCCEEDED(retval)) {
                         if (r.IsDomainMessage) { 
                             ipcParseForDomain(&cur_out_r);
@@ -197,7 +199,7 @@ class MitMSession final : public ISession<T> {
             if (this->active_object == this->service_object && (r.CommandType == IpcCommandType_Request || r.CommandType == IpcCommandType_RequestWithContext)) {
                 IpcCommand c;
                 ipcInitialize(&c);
-                this->service_object->postprocess(cur_out_r, c, cmd_id, (u8 *)this->pointer_buffer, this->pointer_buffer_size);
+                this->service_object->postprocess(cur_out_r, c, cmd_id, (u8 *)this->pointer_buffer.data(), this->pointer_buffer.size());
             } else if (r.CommandType == IpcCommandType_Control || r.CommandType == IpcCommandType_ControlWithContext) {
                 if (cmd_id == IpcCtrl_Cmd_ConvertCurrentObjectToDomain) {
                     this->is_domain = true;
@@ -226,4 +228,4 @@ class MitMSession final : public ISession<T> {
                 }
             }
         }
-};
+};