diff options
author | practicalswift <practicalswift@users.noreply.github.com> | 2017-08-09 16:07:22 +0200 |
---|---|---|
committer | practicalswift <practicalswift@users.noreply.github.com> | 2017-11-09 16:52:44 +0100 |
commit | 8ccf1bb0c31108762e47f28d9d592e8d4c788564 (patch) | |
tree | df1f221b3c3e7d28b743b99b259eb964cde4dff7 /src/net.cpp | |
parent | 73db0635a38744b09058b590ac246af5499630c9 (diff) |
Use unique_ptr for sem{Addnode,Outbound} (CSemaphore)
Diffstat (limited to 'src/net.cpp')
-rw-r--r-- | src/net.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/net.cpp b/src/net.cpp index 2db1f2a04f..5f0a7a4770 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -2222,8 +2222,6 @@ CConnman::CConnman(uint64_t nSeed0In, uint64_t nSeed1In) : nSeed0(nSeed0In), nSe nLastNodeId = 0; nSendBufferMaxSize = 0; nReceiveFloodSize = 0; - semOutbound = nullptr; - semAddnode = nullptr; flagInterruptMsgProc = false; SetTryNewOutboundPeer(false); @@ -2329,11 +2327,11 @@ bool CConnman::Start(CScheduler& scheduler, const Options& connOptions) 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 (semAddnode == nullptr) { // initialize semaphore - semAddnode = new CSemaphore(nMaxAddnode); + semAddnode = std::unique_ptr<CSemaphore>(new CSemaphore(nMaxAddnode)); } // @@ -2456,10 +2454,8 @@ void CConnman::Stop() vNodes.clear(); vNodesDisconnected.clear(); vhListenSocket.clear(); - delete semOutbound; - semOutbound = nullptr; - delete semAddnode; - semAddnode = nullptr; + semOutbound.reset(); + semAddnode.reset(); } void CConnman::DeleteNode(CNode* pnode) |