mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-02 09:46:52 -05:00
Merge #16620: util: Move ResolveErrMsg to util/error
fa27c55b05
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: utACKfa27c55
ryanofsky: utACKfa27c55b05
Tree-SHA512: e2b25ae05082fe9d0ee94bdc7d51f801bd9f78e8fc2b141e9a313e008dbb8a77653fe876e111c802c676859c6b76c37a673d1f8cfbe7ad25607a5ffcffde19fd
This commit is contained in:
commit
21a165325e
4 changed files with 13 additions and 10 deletions
|
@ -824,11 +824,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.
|
||||
*
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue