unique_ptr conversions

Signed-off-by: Rosen Penev <[email protected]>
rakshasa · Jan 12, 2025 · 9cef9ce · 9cef9ce
1 parent 5720967
commit 9cef9ce
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/src/torrent/peer/peer_list.cc b/src/torrent/peer/peer_list.cc
@@ -55,8 +55,7 @@ socket_address_less(const sockaddr* s1, const sockaddr* s2) {
 //
 
 PeerList::PeerList() :
-  m_available_list(new AvailableList) {
-}
+    m_available_list(std::make_unique<AvailableList>()) {}
 
 PeerList::~PeerList() {
   LT_LOG_EVENTS("deleting list total:%" PRIuPTR " available:%" PRIuPTR,
@@ -68,7 +67,6 @@ PeerList::~PeerList() {
   base_type::clear();
 
   m_info = NULL;
-  delete m_available_list;
 }
 
 void

diff --git a/src/torrent/peer/peer_list.h b/src/torrent/peer/peer_list.h
@@ -2,6 +2,7 @@
 #define LIBTORRENT_PEER_LIST_H
 
 #include <map>
+#include <memory>
 #include <torrent/common.h>
 #include <torrent/net/socket_address_key.h>
 #include <torrent/utils/extents.h>
@@ -59,7 +60,9 @@ class LIBTORRENT_EXPORT PeerList : private std::multimap<socket_address_key, Pee
 
   static ipv4_table*  ipv4_filter() { return &m_ipv4_table; }
 
-  AvailableList*      available_list()  { return m_available_list; }
+  const std::unique_ptr<AvailableList>& available_list() {
+    return m_available_list;
+  }
   uint32_t            available_list_size() const;
 
   uint32_t            cull_peers(int flags);
@@ -86,7 +89,7 @@ class LIBTORRENT_EXPORT PeerList : private std::multimap<socket_address_key, Pee
   static ipv4_table   m_ipv4_table;
 
   DownloadInfo*       m_info;
-  AvailableList*      m_available_list;
+  std::unique_ptr<AvailableList> m_available_list;
 };
 
 }

diff --git a/src/torrent/tracker_controller.cc b/src/torrent/tracker_controller.cc
@@ -84,9 +84,9 @@ TrackerController::current_send_state() const {
 }
 
 TrackerController::TrackerController(TrackerList* trackers) :
-  m_flags(0),
-  m_tracker_list(trackers),
-  m_private(new tracker_controller_private) {
+    m_flags(0),
+    m_tracker_list(trackers),
+    m_private(std::make_unique<tracker_controller_private>()) {
 
   m_private->task_timeout.slot() = [this] { do_timeout(); };
   m_private->task_scrape.slot()  = [this] { do_scrape(); };
@@ -95,7 +95,6 @@ TrackerController::TrackerController(TrackerList* trackers) :
 TrackerController::~TrackerController() {
   priority_queue_erase(&taskScheduler, &m_private->task_timeout);
   priority_queue_erase(&taskScheduler, &m_private->task_scrape);
-  delete m_private;
 }
 
 rak::priority_item*

diff --git a/src/torrent/tracker_controller.h b/src/torrent/tracker_controller.h
@@ -38,6 +38,7 @@
 #define LIBTORRENT_TRACKER_CONTROLLER_H
 
 #include <functional>
+#include <memory>
 #include <string>
 
 #include <torrent/common.h>
@@ -153,7 +154,7 @@ class LIBTORRENT_EXPORT TrackerController {
   slot_tracker        m_slot_tracker_disabled;
 
   // Refactor this out.
-  tracker_controller_private* m_private;
+  std::unique_ptr<tracker_controller_private> m_private;
 };
 
 uint32_t tracker_next_timeout(Tracker* tracker, int controller_flags);