highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-14 06:32:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Change base_blob::SetHex() to take std::string_view

Browse Source 
Clarify that hex strings are parsed as little-endian.
This commit is contained in:
Hodlinator
2024-07-23 14:51:36 +02:00
parent 2f5577dc2e
commit 01e314ce0a
3 changed files with 25 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/uint256.cpp
View File

@@ -18,39 +18,31 @@ std::string base_blob<BITS>::GetHex() const
}
template <unsigned int BITS>
void base_blob<BITS>::SetHex(const char* psz)
void base_blob<BITS>::SetHex(const std::string_view str)
{
std::fill(m_data.begin(), m_data.end(), 0);
// skip leading spaces
while (IsSpace(*psz))
psz++;
const auto trimmed = util::RemovePrefixView(util::TrimStringView(str), "0x");
// skip 0x
if (psz[0] == '0' && ToLower(psz[1]) == 'x')
psz += 2;
// hex string to uint
// Note: if we are passed a greater number of digits than would fit as bytes
// in m_data, we will be discarding the leftmost ones.
// str="12bc" in a WIDTH=1 m_data => m_data[] == "\0xbc", not "0x12".
size_t digits = 0;
while (::HexDigit(psz[digits]) != -1)
digits++;
for (const char c : trimmed) {
if (::HexDigit(c) == -1) break;
++digits;
}
unsigned char* p1 = m_data.data();
unsigned char* pend = p1 + WIDTH;
while (digits > 0 && p1 < pend) {
*p1 = ::HexDigit(psz[--digits]);
*p1 = ::HexDigit(trimmed[--digits]);
if (digits > 0) {
*p1 |= ((unsigned char)::HexDigit(psz[--digits]) << 4);
*p1 |= ((unsigned char)::HexDigit(trimmed[--digits]) << 4);
p1++;
}
}
}
template <unsigned int BITS>
void base_blob<BITS>::SetHex(const std::string& str)
{
SetHex(str.c_str());
}
template <unsigned int BITS>
std::string base_blob<BITS>::ToString() const
{
@@ -60,14 +52,12 @@ std::string base_blob<BITS>::ToString() const
// Explicit instantiations for base_blob<160>
template std::string base_blob<160>::GetHex() const;
template std::string base_blob<160>::ToString() const;
template void base_blob<160>::SetHex(const char*);
template void base_blob<160>::SetHex(const std::string&);
template void base_blob<160>::SetHex(std::string_view);
// Explicit instantiations for base_blob<256>
template std::string base_blob<256>::GetHex() const;
template std::string base_blob<256>::ToString() const;
template void base_blob<256>::SetHex(const char*);
template void base_blob<256>::SetHex(const std::string&);
template void base_blob<256>::SetHex(std::string_view);
const uint256 uint256::ZERO(0);
const uint256 uint256::ONE(1);