diff options
| author | Jorge Timón <jtimon@jtimon.cc> | 2016-09-28 10:10:15 +0200 |
|---|---|---|
| committer | Jorge Timón <jtimon@jtimon.cc> | 2016-10-01 08:12:19 +0200 |
| commit | 3450c18a125f125aec76bfef79c69317eaad935d (patch) | |
| tree | d41fdcefaab3cc63947a22d3960b22107cbb35f8 /src/bitcoin-cli.cpp | |
| parent | 7b784cc2bbcdc90361add2adb657c58162aca4ef (diff) | |
| download | bitcoin-3450c18a125f125aec76bfef79c69317eaad935d.tar.xz | |
Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs
Diffstat (limited to 'src/bitcoin-cli.cpp')
| -rw-r--r-- | src/bitcoin-cli.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 68f5d90f51..9d4c4e53bd 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -92,7 +92,7 @@ static bool AppInitRPC(int argc, char* argv[]) return false; } try { - ReadConfigFile(mapArgs, mapMultiArgs); + ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME), mapArgs, mapMultiArgs); } catch (const std::exception& e) { fprintf(stderr,"Error reading configuration file: %s\n", e.what()); return false; @@ -209,7 +209,7 @@ UniValue CallRPC(const string& strMethod, const UniValue& params) if (!GetAuthCookie(&strRPCUserColonPass)) { throw runtime_error(strprintf( _("Could not locate RPC credentials. No authentication cookie could be found, and no rpcpassword is set in the configuration file (%s)"), - GetConfigFile().string().c_str())); + GetConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME)).string().c_str())); } } else { |