Use unique_ptr for sem{Addnode,Outbound} (CSemaphore)

PIVX-Project · Jul 25, 2021 · ff1c454 · ff1c454
1 parent 93daf17
commit ff1c454
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/net.cpp b/src/net.cpp
@@ -1914,11 +1914,10 @@ CConnman::CConnman(uint64_t nSeed0In, uint64_t nSeed1In) : nSeed0(nSeed0In), nSe
     nLastNodeId = 0;
     nSendBufferMaxSize = 0;
     nReceiveFloodSize = 0;
-    semOutbound = NULL;
     nMaxConnections = 0;
     nMaxOutbound = 0;
     nBestHeight = 0;
-    clientInterface = NULL;
+    clientInterface = nullptr;
     flagInterruptMsgProc = false;
 }
 
@@ -1984,9 +1983,9 @@ bool CConnman::Start(CScheduler& scheduler, std::string& strNodeError, Options c
 
     fAddressesInitialized = true;
 
-    if (semOutbound == NULL) {
+    if (semOutbound == nullptr) {
         // initialize semaphore
-        semOutbound = new CSemaphore(std::min((nMaxOutbound + nMaxFeeler), nMaxConnections));
+        semOutbound = std::unique_ptr<CSemaphore>(new CSemaphore(std::min((nMaxOutbound + nMaxFeeler), nMaxConnections)));
     }
 
     if (pnodeLocalHost == nullptr) {
@@ -2113,8 +2112,7 @@ void CConnman::Stop()
     vNodes.clear();
     vNodesDisconnected.clear();
     vhListenSocket.clear();
-    delete semOutbound;
-    semOutbound = NULL;
+    semOutbound.reset();
     if(pnodeLocalHost)
         DeleteNode(pnodeLocalHost);
     pnodeLocalHost = NULL;

diff --git a/src/net.h b/src/net.h
@@ -355,7 +355,7 @@ class CConnman
     /** Services this instance cares about */
     ServiceFlags nRelevantServices{NODE_NONE};
 
-    CSemaphore *semOutbound{nullptr};
+    std::unique_ptr<CSemaphore> semOutbound;
     int nMaxConnections{0};
     int nMaxOutbound{0};
     int nMaxFeeler{0};