diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-04-03 11:51:48 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-04-03 11:52:21 -0400 |
| commit | ad960f5771dc251c8e1198dd8a82e18df4562171 (patch) | |
| tree | ba225416f9a72ba87f9dd6f8fda1dc6ff975ce21 /src/bitcoind.cpp | |
| parent | c564424d98b1561f16e633528172b3583719e5f3 (diff) | |
| parent | b386970d0750e368d6adc5d0c010ead329b5c7c1 (diff) | |
Merge #12846: [moveonly] Extract HelpRequested to dry up the help options testing
b386970d07 [moveonly] Extract HelpRequested to dry up the help options testing (Ben Woosley)
Pull request description:
This ensures consistency across interfaces and makes the version handling more clear.
Tree-SHA512: d3f46d34dae6cf98902b0bbb279ada65c3215a25f69e5ff98b88e68f37a6b027ded265d15c12303998e31b390aa30fdb689455c61c983ab4b7527cbce8f4ec61
Diffstat (limited to 'src/bitcoind.cpp')
| -rw-r--r-- | src/bitcoind.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index df7fad89c2..58518d611f 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -76,8 +76,7 @@ bool AppInit(int argc, char* argv[]) gArgs.ParseParameters(argc, argv); // Process help and version before taking care about datadir - if (gArgs.IsArgSet("-?") || gArgs.IsArgSet("-h") || gArgs.IsArgSet("-help") || gArgs.IsArgSet("-version")) - { + if (HelpRequested(gArgs) || gArgs.IsArgSet("-version")) { std::string strUsage = strprintf(_("%s Daemon"), _(PACKAGE_NAME)) + " " + _("version") + " " + FormatFullVersion() + "\n"; if (gArgs.IsArgSet("-version")) |