Use unique_ptr for httpRPCTimerInterface (HTTPRPCTimerInterface)
This commit is contained in:
parent
860e912583
commit
5a6f768896
1 changed files with 5 additions and 6 deletions
|
@ -62,7 +62,7 @@ private:
|
|||
/* Pre-base64-encoded authentication token */
|
||||
static std::string strRPCUserColonPass;
|
||||
/* Stored RPC timer interface (for unregistration) */
|
||||
static HTTPRPCTimerInterface* httpRPCTimerInterface = nullptr;
|
||||
static std::unique_ptr<HTTPRPCTimerInterface> httpRPCTimerInterface;
|
||||
|
||||
static void JSONErrorReply(HTTPRequest* req, const UniValue& objError, const UniValue& id)
|
||||
{
|
||||
|
@ -238,8 +238,8 @@ bool StartHTTPRPC()
|
|||
RegisterHTTPHandler("/wallet/", false, HTTPReq_JSONRPC);
|
||||
#endif
|
||||
assert(EventBase());
|
||||
httpRPCTimerInterface = new HTTPRPCTimerInterface(EventBase());
|
||||
RPCSetTimerInterface(httpRPCTimerInterface);
|
||||
httpRPCTimerInterface = std::unique_ptr<HTTPRPCTimerInterface>(new HTTPRPCTimerInterface(EventBase()));
|
||||
RPCSetTimerInterface(httpRPCTimerInterface.get());
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -253,8 +253,7 @@ void StopHTTPRPC()
|
|||
LogPrint(BCLog::RPC, "Stopping HTTP RPC server\n");
|
||||
UnregisterHTTPHandler("/", true);
|
||||
if (httpRPCTimerInterface) {
|
||||
RPCUnsetTimerInterface(httpRPCTimerInterface);
|
||||
delete httpRPCTimerInterface;
|
||||
httpRPCTimerInterface = nullptr;
|
||||
RPCUnsetTimerInterface(httpRPCTimerInterface.get());
|
||||
httpRPCTimerInterface.reset();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue