Refactor inotify_monitor to use std::unique_ptr for implementation ma…

…nagement and override destructor and run method
emcrisostomo · Dec 28, 2024 · 488d272 · 488d272
1 parent 4845f62
commit 488d272
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/libfswatch/src/libfswatch/c++/inotify_monitor.cpp b/libfswatch/src/libfswatch/c++/inotify_monitor.cpp
@@ -73,7 +73,7 @@ namespace fsw
                                    FSW_EVENT_CALLBACK *callback,
                                    void *context) :
     monitor(paths_to_monitor, callback, context),
-    impl(new inotify_monitor_impl())
+    impl(std::make_unique<inotify_monitor_impl>())
   {
     impl->inotify_monitor_handle = inotify_init();
 
@@ -104,8 +104,6 @@ namespace fsw
     {
       close(impl->inotify_monitor_handle);
     }
-
-    delete impl;
   }
 
   bool inotify_monitor::add_watch(const std::string& path)

diff --git a/libfswatch/src/libfswatch/c++/inotify_monitor.hpp b/libfswatch/src/libfswatch/c++/inotify_monitor.hpp
@@ -31,6 +31,7 @@
 #  include <string>
 #  include <vector>
 #  include <filesystem>
+#  include <functional>
 
 namespace fsw
 {
@@ -59,7 +60,7 @@ namespace fsw
     /**
      * @brief Destroys an instance of this class.
      */
-    virtual ~inotify_monitor();
+    ~inotify_monitor() override;
 
   protected:
     /**
@@ -69,7 +70,7 @@ namespace fsw
      *
      * @see stop()
      */
-    void run();
+    void run() override;
 
   private:
     inotify_monitor(const inotify_monitor& orig) = delete;
@@ -85,7 +86,7 @@ namespace fsw
     void process_pending_events();
     void remove_watch(int fd);
 
-    inotify_monitor_impl *impl;
+    std::unique_ptr<fsw::inotify_monitor_impl> impl;
   };
 }