aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAtsukiTak <takatomgoo@gmail.com>2018-07-21 18:53:54 +0900
committerAtsukiTak <takatomgoo@gmail.com>2018-07-22 03:16:53 +0900
commit9544a3f3fc5d900fbf90c5347821a7fcafc058b0 (patch)
treeb0f4ef93f2271bd149907cecfdbb4d271e6adc64
parent07ce278455757fb46dab95fb9b97a3f6b1b84faf (diff)
tiny refactor for ArgsManager
This commit contains 2 refactors. 1. mark "const" on ArgsManager::GetHelpMessage and IsArgKnown. 2. remove unused "error" argument from ArgsManager::IsArgKnown. Firstly, I mark "const" on where it is possible to. It is mentioned before (e.g. https://github.com/bitcoin/bitcoin/pull/13190#pullrequestreview-118823133). And about 2nd change, ArgsManager::IsArgKnown was added at commit #4f8704d which was merged at PR #13112. But from its beggining, "error" argument never be used. I think it should be refactored.
-rw-r--r--src/util.cpp8
-rw-r--r--src/util.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/util.cpp b/src/util.cpp
index 97b5205abf..8df23dd08f 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -446,7 +446,7 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin
// Check that the arg is known
if (!(IsSwitchChar(key[0]) && key.size() == 1)) {
- if (!IsArgKnown(key, error)) {
+ if (!IsArgKnown(key)) {
error = strprintf("Invalid parameter %s", key.c_str());
return false;
}
@@ -466,7 +466,7 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin
return true;
}
-bool ArgsManager::IsArgKnown(const std::string& key, std::string& error)
+bool ArgsManager::IsArgKnown(const std::string& key) const
{
size_t option_index = key.find('.');
std::string arg_no_net;
@@ -591,7 +591,7 @@ void ArgsManager::AddHiddenArgs(const std::vector<std::string>& names)
}
}
-std::string ArgsManager::GetHelpMessage()
+std::string ArgsManager::GetHelpMessage() const
{
const bool show_debug = gArgs.GetBoolArg("-help-debug", false);
@@ -859,7 +859,7 @@ bool ArgsManager::ReadConfigStream(std::istream& stream, std::string& error, boo
}
// Check that the arg is known
- if (!IsArgKnown(strKey, error) && !ignore_invalid_keys) {
+ if (!IsArgKnown(strKey) && !ignore_invalid_keys) {
error = strprintf("Invalid configuration value %s", option.first.c_str());
return false;
}
diff --git a/src/util.h b/src/util.h
index f8bcc0192c..2c22720a6b 100644
--- a/src/util.h
+++ b/src/util.h
@@ -276,12 +276,12 @@ public:
/**
* Get the help string
*/
- std::string GetHelpMessage();
+ std::string GetHelpMessage() const;
/**
* Check whether we know of this arg
*/
- bool IsArgKnown(const std::string& key, std::string& error);
+ bool IsArgKnown(const std::string& key) const;
};
extern ArgsManager gArgs;