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/net_permissions.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/net_permissions.cpp')
| -rw-r--r-- | src/net_permissions.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/net_permissions.cpp b/src/net_permissions.cpp index 736f19293a..ef6c40ce20 100644 --- 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) { |