Avoid unnecessary calls to unique_ptr::release()

Author: aroffringa

common/rpc/RpcServer.cpp

@@ -25,6 +25,7 @@
 #include <ola/network/SocketAddress.h>
 #include <ola/network/TCPSocket.h>
 #include <ola/rpc/RpcSessionHandler.h>
+#include <utility>
 #include "common/rpc/RpcChannel.h"
 #include "common/rpc/RpcSession.h"
 
@@ -114,7 +115,7 @@ bool RpcServer::Init() {
     return false;
   }
 
-  m_accepting_socket.reset(accepting_socket.release());
+  m_accepting_socket = std::move(accepting_socket);
   return true;
 }
 

ola/StreamingClientTest.cpp

@@ -98,7 +98,7 @@ bool OlaServerThread::Setup() {
   // pick an unused port
   unique_ptr<OlaDaemon> olad(new OlaDaemon(ola_options, NULL));
   if (olad->Init()) {
-    m_olad.reset(olad.release());
+    m_olad = std::move(olad);
     return true;
   } else {
     return false;

olad/OlaDaemon.cpp

@@ -32,6 +32,7 @@
 #include <Shlobj.h>
 #endif  // _WIN32
 #include <string>
+#include <utility>
 
 #include "ola/ExportMap.h"
 #include "ola/Logging.h"
@@ -136,8 +137,8 @@ bool OlaDaemon::Init() {
   bool ok = server->Init();
   if (ok) {
     // Set the members
-    m_preferences_factory.reset(preferences_factory.release());
-    m_server.reset(server.release());
+    m_preferences_factory = std::move(preferences_factory);
+    m_server = std::move(server);
   } else {
     STLDeleteElements(&m_plugin_loaders);
   }

olad/OlaServer.cpp

@@ -270,7 +270,7 @@ bool OlaServer::Init() {
 
   // Initializing the web server causes a call to NewClient. We need to have
   // the broker in place for the call, otherwise we'll segfault.
-  m_broker.reset(broker.release());
+  m_broker = std::move(broker);
 
 #ifdef HAVE_LIBMICROHTTPD
   if (m_options.http_enable) {
@@ -296,15 +296,15 @@ bool OlaServer::Init() {
 
   // Ok, we've created and initialized everything correctly by this point. Now
   // we save all the pointers and schedule the last of the callbacks.
-  m_device_manager.reset(device_manager.release());
-  m_discovery_agent.reset(discovery_agent.release());
-  m_plugin_adaptor.reset(plugin_adaptor.release());
-  m_plugin_manager.reset(plugin_manager.release());
-  m_port_broker.reset(port_broker.release());
-  m_port_manager.reset(port_manager.release());
-  m_rpc_server.reset(rpc_server.release());
-  m_service_impl.reset(service_impl.release());
-  m_universe_store.reset(universe_store.release());
+  m_device_manager = std::move(device_manager);
+  m_discovery_agent = std::move(discovery_agent);
+  m_plugin_adaptor = std::move(plugin_adaptor);
+  m_plugin_manager = std::move(plugin_manager);
+  m_port_broker = std::move(port_broker);
+  m_port_manager = std::move(port_manager);
+  m_rpc_server = std::move(rpc_server);
+  m_service_impl = std::move(service_impl);
+  m_universe_store = std::move(universe_store);
 
   UpdatePidStore(pid_store.release());
 
@@ -434,7 +434,7 @@ bool OlaServer::StartHttpServer(ola::rpc::RpcServer *server,
     httpd->Start();
     // register the pipe descriptor as a client
     InternalNewConnection(server, pipe_descriptor.release());
-    m_httpd.reset(httpd.release());
+    m_httpd = std::move(httpd);
     return true;
   } else {
     pipe_descriptor->Close();

plugins/kinet/KiNetNode.cpp

@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <memory>
+#include <utility>
 
 #include "ola/Constants.h"
 #include "ola/Logging.h"
@@ -208,7 +209,7 @@ void KiNetNode::PopulatePacketHeader(uint16_t msg_type) {
  * Setup the networking components.
  */
 bool KiNetNode::InitNetwork() {
-  std::unique_ptr<ola::network::UDPSocketInterface> socket(m_socket.release());
+  std::unique_ptr<ola::network::UDPSocketInterface> socket(std::move(m_socket));
 
   if (!socket.get())
     socket.reset(new UDPSocket());
@@ -224,7 +225,7 @@ bool KiNetNode::InitNetwork() {
 
   socket->SetOnData(NewCallback(this, &KiNetNode::SocketReady));
   m_ss->AddReadDescriptor(socket.get());
-  m_socket.reset(socket.release());
+  m_socket = std::move(socket);
   return true;
 }
 }  // namespace kinet

plugins/nanoleaf/NanoleafNode.cpp

@@ -22,6 +22,7 @@
 
 #include <algorithm>
 #include <memory>
+#include <utility>
 #include <vector>
 
 #include "ola/Constants.h"
@@ -157,7 +158,7 @@ void NanoleafNode::SocketReady() {
  * Setup the networking components.
  */
 bool NanoleafNode::InitNetwork() {
-  std::unique_ptr<ola::network::UDPSocketInterface> socket(m_socket.release());
+  std::unique_ptr<ola::network::UDPSocketInterface> socket(std::move(m_socket));
 
   if (!socket.get()) {
     socket.reset(new UDPSocket());
@@ -176,7 +177,7 @@ bool NanoleafNode::InitNetwork() {
   // Do we need to call this if we don't bind?
   socket->SetOnData(NewCallback(this, &NanoleafNode::SocketReady));
   m_ss->AddReadDescriptor(socket.get());
-  m_socket.reset(socket.release());
+  m_socket = std::move(socket);
   return true;
 }
 }  // namespace nanoleaf

plugins/openpixelcontrol/OPCServer.cpp

@@ -21,6 +21,7 @@
 #include "plugins/openpixelcontrol/OPCServer.h"
 
 #include <string>
+#include <utility>
 #include "ola/Callback.h"
 #include "ola/Logging.h"
 #include "ola/base/Array.h"
@@ -88,7 +89,7 @@ bool OPCServer::Init() {
     return false;
   }
   m_ss->AddReadDescriptor(listening_socket.get());
-  m_listening_socket.reset(listening_socket.release());
+  m_listening_socket = std::move(listening_socket);
   return true;
 }
 

plugins/usbdmx/AVLdiyD512.cpp

@@ -22,6 +22,7 @@
 
 #include <unistd.h>
 #include <string>
+#include <utility>
 
 #include "libs/usb/LibUsbAdaptor.h"
 #include "ola/Logging.h"
@@ -105,7 +106,7 @@ bool SynchronousAVLdiyD512::Init() {
   if (!sender->Start()) {
     return false;
   }
-  m_sender.reset(sender.release());
+  m_sender = std::move(sender);
   return true;
 }
 

plugins/usbdmx/AnymauDMX.cpp

@@ -22,6 +22,7 @@
 
 #include <unistd.h>
 #include <string>
+#include <utility>
 
 #include "libs/usb/LibUsbAdaptor.h"
 #include "ola/Logging.h"
@@ -105,7 +106,7 @@ bool SynchronousAnymauDMX::Init() {
   if (!sender->Start()) {
     return false;
   }
-  m_sender.reset(sender.release());
+  m_sender = std::move(sender);
   return true;
 }
 

plugins/usbdmx/AsyncPluginImpl.cpp

@@ -141,7 +141,7 @@ bool AsyncPluginImpl::Start() {
     return false;
   }
 
-  m_agent.reset(agent.release());
+  m_agent = std::move(agent);
   return true;
 }