[moveonly] Extract HelpRequested to dry up the help options testing

This ensures consistency across interfaces and makes the version handling more clear.
This commit is contained in:
Ben Woosley
2018-03-30 13:47:36 -07:00
parent c564424d98
commit b386970d07
7 changed files with 14 additions and 9 deletions

View File

@@ -82,7 +82,7 @@ static int AppInitRPC(int argc, char* argv[])
// Parameters
//
gArgs.ParseParameters(argc, argv);
if (argc<2 || gArgs.IsArgSet("-?") || gArgs.IsArgSet("-h") || gArgs.IsArgSet("-help") || gArgs.IsArgSet("-version")) {
if (argc < 2 || HelpRequested(gArgs) || gArgs.IsArgSet("-version")) {
std::string strUsage = strprintf(_("%s RPC client version"), _(PACKAGE_NAME)) + " " + FormatFullVersion() + "\n";
if (!gArgs.IsArgSet("-version")) {
strUsage += "\n" + _("Usage:") + "\n" +