From 1fdb9696b53e0bc6fe0c71f0b33770c817e8c60a Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Sat, 16 Jun 2018 17:09:15 +0200 Subject: [PATCH] fs.mitm: Use unique_ptr --- stratosphere/fs_mitm/source/fsmitm_main.cpp | 10 ++++------ stratosphere/fs_mitm/source/fsmitm_worker.cpp | 6 ++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/stratosphere/fs_mitm/source/fsmitm_main.cpp b/stratosphere/fs_mitm/source/fsmitm_main.cpp index 43ac4a53e..700100bdf 100644 --- a/stratosphere/fs_mitm/source/fsmitm_main.cpp +++ b/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(1, U64_MAX, 0x20000); + //auto server_manager = std::make_unique(U64_MAX); /* Create fsp-srv mitm. */ ISession> *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; } diff --git a/stratosphere/fs_mitm/source/fsmitm_worker.cpp b/stratosphere/fs_mitm/source/fsmitm_worker.cpp index 6973a19a4..5146e8135 100644 --- a/stratosphere/fs_mitm/source/fsmitm_worker.cpp +++ b/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 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(U64_MAX); g_worker_waiter->add_waitable(g_new_waitable_event); /* Service processes. */ g_worker_waiter->process(); - - delete g_worker_waiter; }