diff options
author | MarcoFalke <falke.marco@gmail.com> | 2019-08-16 07:53:16 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2019-08-16 07:53:23 -0400 |
commit | 21a165325eda90fa6eb70ca0b9e3fa23924f5964 (patch) | |
tree | a12a5a972eb1706120aa071e63526849e13b7290 /src/util/error.cpp | |
parent | 93bacb8cc9c05010659d9aea463ebac5c1b6bf39 (diff) | |
parent | fa27c55b0593c769b6ad87de0b59df3816d73548 (diff) |
Merge #16620: util: Move ResolveErrMsg to util/error
fa27c55b0593c769b6ad87de0b59df3816d73548 util: Move ResolveErrMsg to util/error (MarcoFalke)
Pull request description:
Pull request https://github.com/bitcoin/bitcoin/pull/16248#discussion_r314035862 duplicated the body of this util function. The whole point of the util function is to be shared, so do that here as a fixup to #16248
ACKs for top commit:
Sjors:
utACK fa27c55
ryanofsky:
utACK fa27c55b0593c769b6ad87de0b59df3816d73548
Tree-SHA512: e2b25ae05082fe9d0ee94bdc7d51f801bd9f78e8fc2b141e9a313e008dbb8a77653fe876e111c802c676859c6b76c37a673d1f8cfbe7ad25607a5ffcffde19fd
Diffstat (limited to 'src/util/error.cpp')
-rw-r--r-- | src/util/error.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/util/error.cpp b/src/util/error.cpp index 9edb7dc533..287476c0d3 100644 --- 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); } |