From d3e8adfada889a3c9fba930086eda609509aca07 Mon Sep 17 00:00:00 2001 From: Sebastian Falbesoner Date: Mon, 17 Aug 2020 01:43:11 +0200 Subject: util: remove c-string interfaces for DecodeBase58{Check} --- src/base58.cpp | 4 ++-- 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& vch, int max_ret_len) +NODISCARD static bool DecodeBase58(const char* psz, std::vector& vch, int max_ret_len) { // Skip leading spaces. while (*psz && IsSpace(*psz)) @@ -146,7 +146,7 @@ std::string EncodeBase58Check(const std::vector& vchIn) return EncodeBase58(vch); } -bool DecodeBase58Check(const char* psz, std::vector& vchRet, int max_ret_len) +NODISCARD static bool DecodeBase58Check(const char* psz, std::vector& vchRet, int max_ret_len) { if (!DecodeBase58(psz, vchRet, max_ret_len > std::numeric_limits::max() - 4 ? std::numeric_limits::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 @@ -30,13 +30,6 @@ std::string EncodeBase58(const unsigned char* pbegin, const unsigned char* pend) */ std::string EncodeBase58(const std::vector& 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& vchRet, int max_ret_len); - /** * Decode a base58-encoded string (str) into a byte vector (vchRet). * return true if decoding is successful. @@ -48,12 +41,6 @@ NODISCARD bool DecodeBase58(const std::string& str, std::vector& */ std::string EncodeBase58Check(const std::vector& 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& 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 -- cgit v1.2.3