Browse files

CRPCCommand.unlocked -> CRPCCommand.threadSafe

unlocked could be confused with wallet encryption
  • Loading branch information...
1 parent dcf8b8f commit 10ef3611697cdf867730689f6968ba48adc4d6e2 @freewil freewil committed Mar 7, 2013
Showing with 4 additions and 4 deletions.
  1. +3 −3 src/bitcoinrpc.cpp
  2. +1 −1 src/bitcoinrpc.h
View
6 src/bitcoinrpc.cpp
@@ -194,8 +194,8 @@ Value stop(const Array& params, bool fHelp)
static const CRPCCommand vRPCCommands[] =
-{ // name actor (function) okSafeMode 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
// Execute
Value result;
{
- if (pcmd->unlocked)
+ if (pcmd->threadSafe)
result = pcmd->actor(params, false);
else {
LOCK2(cs_main, pwalletMain->cs_wallet);
View
2 src/bitcoinrpc.h
@@ -95,7 +95,7 @@ class CRPCCommand
std::string name;
rpcfn_type actor;
bool okSafeMode;
- bool unlocked;
+ bool threadSafe;
};
/**

0 comments on commit 10ef361

Please sign in to comment.