diff options
| author | freewil <sean@eternalrise.com> | 2013-03-07 06:18:55 -0500 |
|---|---|---|
| committer | freewil <sean@eternalrise.com> | 2013-03-07 06:18:55 -0500 |
| commit | 10ef3611697cdf867730689f6968ba48adc4d6e2 (patch) | |
| tree | db46070378b72c9ef8f673a19cd690a94eebe0d1 | |
| parent | dcf8b8fd9e9fc964eda083ee82e46df58958f705 (diff) | |
CRPCCommand.unlocked -> CRPCCommand.threadSafe
unlocked could be confused with wallet encryption
| -rw-r--r-- | src/bitcoinrpc.cpp | 6 | ||||
| -rw-r--r-- | src/bitcoinrpc.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 31acbe7863..4a6cc42efc 100644 --- a/src/bitcoinrpc.cpp +++ b/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); diff --git a/src/bitcoinrpc.h b/src/bitcoinrpc.h index 36bfbe3eef..6a3554aea6 100644 --- a/src/bitcoinrpc.h +++ b/src/bitcoinrpc.h @@ -95,7 +95,7 @@ public: std::string name; rpcfn_type actor; bool okSafeMode; - bool unlocked; + bool threadSafe; }; /** |