unique_ptr

Author: neheb

src/download/download_constructor.cc

@@ -131,20 +131,20 @@ DownloadConstructor::parse_info(const Object& b) {
 }
 
 void
-DownloadConstructor::parse_tracker(const Object& b) {
+DownloadConstructor::parse_tracker(const std::unique_ptr<Object>& b) {
   const Object::list_type* announce_list = NULL;
 
-  if (b.has_key_list("announce-list") &&
+  if (b->has_key_list("announce-list") &&
 
       // Some torrent makers create empty/invalid 'announce-list'
       // entries while still having valid 'announce'.
-      !(announce_list = &b.get_key_list("announce-list"))->empty() &&
+      !(announce_list = &b->get_key_list("announce-list"))->empty() &&
       std::any_of(announce_list->begin(), announce_list->end(), std::mem_fn(&Object::is_list))) {
     for (const auto& group : *announce_list) {
       add_tracker_group(group);
     }
-  } else if (b.has_key("announce")) {
-    add_tracker_single(b.get_key("announce"), 0);
+  } else if (b->has_key("announce")) {
+    add_tracker_single(b->get_key("announce"), 0);
 
   } else if (!manager->dht_controller()->is_valid() || m_download->info()->is_private()) {
     throw bencode_error("Could not find any trackers");
@@ -153,8 +153,8 @@ DownloadConstructor::parse_tracker(const Object& b) {
   if (manager->dht_controller()->is_valid() && !m_download->info()->is_private())
     m_download->main()->tracker_list()->insert_url(m_download->main()->tracker_list()->size_group(), "dht://");
 
-  if (manager->dht_controller()->is_valid() && b.has_key_list("nodes")) {
-    for (const auto& node : b.get_key_list("nodes")) {
+  if (manager->dht_controller()->is_valid() && b->has_key_list("nodes")) {
+    for (const auto& node : b->get_key_list("nodes")) {
       add_dht_node(node);
     }
   }

src/download/download_constructor.h

@@ -2,6 +2,7 @@
 #define LIBTORRENT_PARSE_DOWNLOAD_CONSTRUCTOR_H
 
 #include <list>
+#include <memory>
 
 #include "torrent/object.h"
 
@@ -17,7 +18,7 @@ class DownloadConstructor {
 public:
   void                initialize(Object& b);
 
-  void                parse_tracker(const Object& b);
+  void                parse_tracker(const std::unique_ptr<Object>& b);
 
   void                set_download(DownloadWrapper* d)         { m_download = d; }
   void                set_encoding_list(const EncodingList* e) { m_encodingList = e; }

src/download/download_wrapper.h

@@ -41,7 +41,7 @@ class DownloadWrapper {
   HashTorrent*        hash_checker()                          { return m_hash_checker.get(); }
 
   Object*             bencode()                               { return m_bencode.get(); }
-  void                set_bencode(Object* o)                  { m_bencode.reset(o); }
+  void                set_bencode(std::unique_ptr<Object> o)  { m_bencode = std::move(o); }
 
   HashQueue*          hash_queue()                            { return m_hash_queue; }
   void                set_hash_queue(HashQueue* q)            { m_hash_queue = q; }

src/torrent/torrent.cc

@@ -156,7 +156,7 @@ encoding_list() {
 }
 
 Download
-download_add(Object* object, uint32_t tracker_key) {
+download_add(std::unique_ptr<Object> object, uint32_t tracker_key) {
   auto download = std::make_unique<DownloadWrapper>();
 
   DownloadConstructor ctor;
@@ -188,7 +188,7 @@ download_add(Object* object, uint32_t tracker_key) {
 
   // Add trackers, etc, after setting the info hash so that log
   // entries look sane.
-  ctor.parse_tracker(*object);
+  ctor.parse_tracker(object);
 
   // Default PeerConnection factory functions.
   download->main()->connection_list()->slot_new_connection(&createPeerConnectionDefault);
@@ -198,7 +198,7 @@ download_add(Object* object, uint32_t tracker_key) {
   // go in there.
   manager->initialize_download(download.get());
 
-  download->set_bencode(object);
+  download->set_bencode(std::move(object));
   return Download(download.release());
 }