LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Use unique_ptr for httpRPCTimerInterface (HTTPRPCTimerInterface)

Browse source
This commit is contained in:
practicalswift 2017-08-09 15:08:58 +02:00
parent 860e912583
commit 5a6f768896
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/httprpc.cpp
View file

@ -62,7 +62,7 @@ private:
/* Pre-base64-encoded authentication token */ /* Pre-base64-encoded authentication token */
static std::string strRPCUserColonPass; static std::string strRPCUserColonPass;
/* Stored RPC timer interface (for unregistration) */ /* 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) static void JSONErrorReply(HTTPRequest* req, const UniValue& objError, const UniValue& id)
{ {
@ -238,8 +238,8 @@ bool StartHTTPRPC()
RegisterHTTPHandler("/wallet/", false, HTTPReq_JSONRPC); RegisterHTTPHandler("/wallet/", false, HTTPReq_JSONRPC);
#endif #endif
assert(EventBase()); assert(EventBase());
httpRPCTimerInterface = new HTTPRPCTimerInterface(EventBase()); httpRPCTimerInterface = std::unique_ptr<HTTPRPCTimerInterface>(new HTTPRPCTimerInterface(EventBase()));
RPCSetTimerInterface(httpRPCTimerInterface); RPCSetTimerInterface(httpRPCTimerInterface.get());
return true; return true;
} }
@ -253,8 +253,7 @@ void StopHTTPRPC()
LogPrint(BCLog::RPC, "Stopping HTTP RPC server\n"); LogPrint(BCLog::RPC, "Stopping HTTP RPC server\n");
UnregisterHTTPHandler("/", true); UnregisterHTTPHandler("/", true);
if (httpRPCTimerInterface) { if (httpRPCTimerInterface) {
RPCUnsetTimerInterface(httpRPCTimerInterface); RPCUnsetTimerInterface(httpRPCTimerInterface.get());
delete httpRPCTimerInterface; httpRPCTimerInterface.reset();
httpRPCTimerInterface = nullptr;
} }
} }