Browse Source

Merge pull request #2348 from freewil/crpccommand-table

make vRPCCommands comment match property names
0.8
Gavin Andresen 12 years ago
parent
commit
bd80c66ac0
  1. 6
      src/bitcoinrpc.cpp
  2. 2
      src/bitcoinrpc.h

6
src/bitcoinrpc.cpp

@ -194,8 +194,8 @@ Value stop(const Array& params, bool fHelp) @@ -194,8 +194,8 @@ Value stop(const Array& params, bool fHelp)
static const CRPCCommand vRPCCommands[] =
{ // name function safemd unlocked
// ------------------------ ----------------------- ------ --------
{ // name actor (function) okSafeMode threadSafe
// ------------------------ ----------------------- ---------- ----------
{ "help", &help, true, true },
{ "stop", &stop, true, true },
{ "getblockcount", &getblockcount, true, false },
@ -1072,7 +1072,7 @@ json_spirit::Value CRPCTable::execute(const std::string &strMethod, const json_s @@ -1072,7 +1072,7 @@ json_spirit::Value CRPCTable::execute(const std::string &strMethod, const json_s
// Execute
Value result;
{
if (pcmd->unlocked)
if (pcmd->threadSafe)
result = pcmd->actor(params, false);
else {
LOCK2(cs_main, pwalletMain->cs_wallet);

2
src/bitcoinrpc.h

@ -95,7 +95,7 @@ public: @@ -95,7 +95,7 @@ public:
std::string name;
rpcfn_type actor;
bool okSafeMode;
bool unlocked;
bool threadSafe;
};
/**

Loading…
Cancel
Save