util: Move ResolveErrMsg to util/error

MarcoFalke · MarcoFalke · commit 7160c347b9cc · 2019-08-15T10:05:32.000-04:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -822,11 +822,6 @@ void InitParameterInteraction()
     }
 }
 
-static std::string ResolveErrMsg(const char * const optname, const std::string& strBind)
-{
-    return strprintf(_("Cannot resolve -%s address: '%s'").translated, optname, strBind);
-}
-
 /**
  * Initialize global loggers.
  *
diff --git a/src/net_permissions.cpp b/src/net_permissions.cpp
@@ -3,9 +3,10 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <net_permissions.h>
+#include <netbase.h>
+#include <util/error.h>
 #include <util/system.h>
 #include <util/translation.h>
-#include <netbase.h>
 
 // The parse the following format "perm1,perm2@xxxxxx"
 bool TryParsePermissionFlags(const std::string str, NetPermissionFlags& output, size_t& readen, std::string& error)
@@ -71,7 +72,7 @@ bool NetWhitebindPermissions::TryParse(const std::string str, NetWhitebindPermis
     const std::string strBind = str.substr(offset);
     CService addrBind;
     if (!Lookup(strBind.c_str(), addrBind, 0, false)) {
-        error = strprintf(_("Cannot resolve -%s address: '%s'").translated, "whitebind", strBind);
+        error = ResolveErrMsg("whitebind", strBind);
         return false;
     }
     if (addrBind.GetPort() == 0) {
diff --git a/src/util/error.cpp b/src/util/error.cpp
@@ -36,12 +36,17 @@ std::string TransactionErrorString(const TransactionError err)
     assert(false);
 }
 
+std::string ResolveErrMsg(const std::string& optname, const std::string& strBind)
+{
+    return strprintf(_("Cannot resolve -%s address: '%s'").translated, optname, strBind);
+}
+
 std::string AmountHighWarn(const std::string& optname)
 {
     return strprintf(_("%s is set very high!").translated, optname);
 }
 
-std::string AmountErrMsg(const char* const optname, const std::string& strValue)
+std::string AmountErrMsg(const std::string& optname, const std::string& strValue)
 {
     return strprintf(_("Invalid amount for -%s=<amount>: '%s'").translated, optname, strValue);
 }
diff --git a/src/util/error.h b/src/util/error.h
@@ -10,7 +10,7 @@
  * string functions. Types and functions defined here should not require any
  * outside dependencies.
  *
- * Error types defined here can be used in different parts of the bitcoin
+ * Error types defined here can be used in different parts of the
  * codebase, to avoid the need to write boilerplate code catching and
  * translating errors passed across wallet/node/rpc/gui code boundaries.
  */
@@ -32,8 +32,10 @@ enum class TransactionError {
 
 std::string TransactionErrorString(const TransactionError error);
 
+std::string ResolveErrMsg(const std::string& optname, const std::string& strBind);
+
 std::string AmountHighWarn(const std::string& optname);
 
-std::string AmountErrMsg(const char* const optname, const std::string& strValue);
+std::string AmountErrMsg(const std::string& optname, const std::string& strValue);
 
 #endif // BITCOIN_UTIL_ERROR_H

Original file line number	Diff line number	Diff line change
`@@ -822,11 +822,6 @@ void InitParameterInteraction()`
`822`	`822`	`}`
`823`	`823`	`}`
`824`	`824`
`825`		`-static std::string ResolveErrMsg(const char * const optname, const std::string& strBind)`
`826`		`-{`
`827`		`- return strprintf(_("Cannot resolve -%s address: '%s'").translated, optname, strBind);`
`828`		`-}`
`829`		`-`
`830`	`825`	`/**`
`831`	`826`	`* Initialize global loggers.`
`832`	`827`	`*`
Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,17 @@ std::string TransactionErrorString(const TransactionError err)`
`36`	`36`	`assert(false);`
`37`	`37`	`}`
`38`	`38`
	`39`	`+std::string ResolveErrMsg(const std::string& optname, const std::string& strBind)`
	`40`	`+{`
	`41`	`+ return strprintf(_("Cannot resolve -%s address: '%s'").translated, optname, strBind);`
	`42`	`+}`
	`43`	`+`
`39`	`44`	`std::string AmountHighWarn(const std::string& optname)`
`40`	`45`	`{`
`41`	`46`	`return strprintf(_("%s is set very high!").translated, optname);`
`42`	`47`	`}`
`43`	`48`
`44`		`-std::string AmountErrMsg(const char* const optname, const std::string& strValue)`
	`49`	`+std::string AmountErrMsg(const std::string& optname, const std::string& strValue)`
`45`	`50`	`{`
`46`	`51`	`return strprintf(_("Invalid amount for -%s=<amount>: '%s'").translated, optname, strValue);`
`47`	`52`	`}`