diff options
author | Sebastian Falbesoner <sebastian.falbesoner@gmail.com> | 2020-08-17 01:43:11 +0200 |
---|---|---|
committer | Sebastian Falbesoner <sebastian.falbesoner@gmail.com> | 2020-08-17 13:16:09 +0200 |
commit | d3e8adfada889a3c9fba930086eda609509aca07 (patch) | |
tree | f106dae11ab2552c6d4329a9c0cfd2b8da5e7a97 | |
parent | ffad34816722cdf27a0a7c16539ddd1d655602e0 (diff) | |
download | bitcoin-d3e8adfada889a3c9fba930086eda609509aca07.tar.xz |
util: remove c-string interfaces for DecodeBase58{Check}
-rw-r--r-- | src/base58.cpp | 4 | ||||
-rw-r--r-- | src/base58.h | 13 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/base58.cpp b/src/base58.cpp index 9b2946e7a9..3a28088079 100644 --- a/src/base58.cpp +++ b/src/base58.cpp @@ -35,7 +35,7 @@ static const int8_t mapBase58[256] = { -1,-1,-1,-1,-1,-1,-1,-1, -1,-1,-1,-1,-1,-1,-1,-1, }; -bool DecodeBase58(const char* psz, std::vector<unsigned char>& vch, int max_ret_len) +NODISCARD static bool DecodeBase58(const char* psz, std::vector<unsigned char>& vch, int max_ret_len) { // Skip leading spaces. while (*psz && IsSpace(*psz)) @@ -146,7 +146,7 @@ std::string EncodeBase58Check(const std::vector<unsigned char>& vchIn) return EncodeBase58(vch); } -bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRet, int max_ret_len) +NODISCARD static bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRet, int max_ret_len) { if (!DecodeBase58(psz, vchRet, max_ret_len > std::numeric_limits<int>::max() - 4 ? std::numeric_limits<int>::max() : max_ret_len + 4) || (vchRet.size() < 4)) { diff --git a/src/base58.h b/src/base58.h index 042ad671d3..a869ee1e75 100644 --- a/src/base58.h +++ b/src/base58.h @@ -31,13 +31,6 @@ std::string EncodeBase58(const unsigned char* pbegin, const unsigned char* pend) std::string EncodeBase58(const std::vector<unsigned char>& vch); /** - * Decode a base58-encoded string (psz) into a byte vector (vchRet). - * return true if decoding is successful. - * psz cannot be nullptr. - */ -NODISCARD bool DecodeBase58(const char* psz, std::vector<unsigned char>& vchRet, int max_ret_len); - -/** * Decode a base58-encoded string (str) into a byte vector (vchRet). * return true if decoding is successful. */ @@ -49,12 +42,6 @@ NODISCARD bool DecodeBase58(const std::string& str, std::vector<unsigned char>& std::string EncodeBase58Check(const std::vector<unsigned char>& vchIn); /** - * Decode a base58-encoded string (psz) that includes a checksum into a byte - * vector (vchRet), return true if decoding is successful - */ -NODISCARD bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRet, int max_ret_len); - -/** * Decode a base58-encoded string (str) that includes a checksum into a byte * vector (vchRet), return true if decoding is successful */ |