diff options
| author | Ben Woosley <ben.woosley@gmail.com> | 2020-02-12 12:33:37 -0500 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-09-02 13:19:42 +0800 |
| commit | 4bf18b089e1bb1f3ab513cbdf6674bd1074f4621 (patch) | |
| tree | 720d45ec1aa357c00c059a01f5aaa474f48e5e22 | |
| parent | 93551862a18965bcee0c883c54807e8726e2f50f (diff) | |
Replace use of boost::trim_right with locale-independent TrimString
Note the only use of readStdin is fed to DecodeHexTx, which fails in
IsHex on non-hex characters as recorded in p_util_hexdigit.
| -rw-r--r-- | src/bitcoin-tx.cpp | 4 | ||||
| -rwxr-xr-x | test/lint/lint-locale-dependence.sh | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index cd2cdf01f2..58c51bd8e0 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -772,9 +772,7 @@ static std::string readStdin() if (ferror(stdin)) throw std::runtime_error("error reading stdin"); - boost::algorithm::trim_right(ret); - - return ret; + return TrimString(ret); } static int CommandLineRawTx(int argc, char* argv[]) diff --git a/test/lint/lint-locale-dependence.sh b/test/lint/lint-locale-dependence.sh index 3ac2d10959..d6312270e7 100755 --- a/test/lint/lint-locale-dependence.sh +++ b/test/lint/lint-locale-dependence.sh @@ -39,7 +39,6 @@ export LC_ALL=C KNOWN_VIOLATIONS=( "src/bitcoin-tx.cpp.*stoul" - "src/bitcoin-tx.cpp.*trim_right" "src/dbwrapper.cpp.*stoul" "src/dbwrapper.cpp:.*vsnprintf" "src/node/blockstorage.cpp:.*atoi" |