diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2015-05-13 14:43:31 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2015-05-13 15:15:33 -0400 |
| commit | 351f73ecd5d44bf6b80f45ab2e1aaa25a08c5c8c (patch) | |
| tree | a552d4d89fef048dff22214d32f225f13e33d211 /src | |
| parent | 2cc1372190c01bc6aae70f94fcc3b81ae4f7aba3 (diff) | |
| parent | 472b4c5dda33aa178fd99d875350eda9d821b3ef (diff) | |
| download | bitcoin-351f73ecd5d44bf6b80f45ab2e1aaa25a08c5c8c.tar.xz | |
Merge pull request #6125
472b4c5 Clean up parsing of bool command line args (Alex Morcos)
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/init.cpp b/src/init.cpp index 47cbda32f5..6ef0ce4268 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -834,13 +834,13 @@ bool AppInit2(boost::thread_group& threadGroup) } } nTxConfirmTarget = GetArg("-txconfirmtarget", 1); - bSpendZeroConfChange = GetArg("-spendzeroconfchange", true); - fSendFreeTransactions = GetArg("-sendfreetransactions", false); + bSpendZeroConfChange = GetBoolArg("-spendzeroconfchange", true); + fSendFreeTransactions = GetBoolArg("-sendfreetransactions", false); std::string strWalletFile = GetArg("-wallet", "wallet.dat"); #endif // ENABLE_WALLET - fIsBareMultisigStd = GetArg("-permitbaremultisig", true) != 0; + fIsBareMultisigStd = GetBoolArg("-permitbaremultisig", true); nMaxDatacarrierBytes = GetArg("-datacarriersize", nMaxDatacarrierBytes); // ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log @@ -955,7 +955,7 @@ bool AppInit2(boost::thread_group& threadGroup) proxyType addrProxy; bool fProxy = false; if (mapArgs.count("-proxy")) { - addrProxy = proxyType(CService(mapArgs["-proxy"], 9050), GetArg("-proxyrandomize", true)); + addrProxy = proxyType(CService(mapArgs["-proxy"], 9050), GetBoolArg("-proxyrandomize", true)); if (!addrProxy.IsValid()) return InitError(strprintf(_("Invalid -proxy address: '%s'"), mapArgs["-proxy"])); @@ -972,7 +972,7 @@ bool AppInit2(boost::thread_group& threadGroup) if (!mapArgs.count("-onion")) addrOnion = addrProxy; else - addrOnion = proxyType(CService(mapArgs["-onion"], 9050), GetArg("-proxyrandomize", true)); + addrOnion = proxyType(CService(mapArgs["-onion"], 9050), GetBoolArg("-proxyrandomize", true)); if (!addrOnion.IsValid()) return InitError(strprintf(_("Invalid -onion address: '%s'"), mapArgs["-onion"])); SetProxy(NET_TOR, addrOnion); |