scripted-diff: rename base_blob::data to m_data
This is in preparation for exposing a ::data member function. -BEGIN VERIFY SCRIPT- sed -i "s/\([^.]\|other.\)data/\1m_data/g" src/uint256.h src/uint256.cpp -END VERIFY SCRIPT-
This commit is contained in:
parent
edec7f7c25
commit
131a2f0337
2 changed files with 18 additions and 18 deletions
|
@ -12,20 +12,20 @@
|
||||||
template <unsigned int BITS>
|
template <unsigned int BITS>
|
||||||
base_blob<BITS>::base_blob(const std::vector<unsigned char>& vch)
|
base_blob<BITS>::base_blob(const std::vector<unsigned char>& vch)
|
||||||
{
|
{
|
||||||
assert(vch.size() == sizeof(data));
|
assert(vch.size() == sizeof(m_data));
|
||||||
memcpy(data, vch.data(), sizeof(data));
|
memcpy(m_data, vch.data(), sizeof(m_data));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <unsigned int BITS>
|
template <unsigned int BITS>
|
||||||
std::string base_blob<BITS>::GetHex() const
|
std::string base_blob<BITS>::GetHex() const
|
||||||
{
|
{
|
||||||
return HexStr(std::reverse_iterator<const uint8_t*>(data + sizeof(data)), std::reverse_iterator<const uint8_t*>(data));
|
return HexStr(std::reverse_iterator<const uint8_t*>(m_data + sizeof(m_data)), std::reverse_iterator<const uint8_t*>(m_data));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <unsigned int BITS>
|
template <unsigned int BITS>
|
||||||
void base_blob<BITS>::SetHex(const char* psz)
|
void base_blob<BITS>::SetHex(const char* psz)
|
||||||
{
|
{
|
||||||
memset(data, 0, sizeof(data));
|
memset(m_data, 0, sizeof(m_data));
|
||||||
|
|
||||||
// skip leading spaces
|
// skip leading spaces
|
||||||
while (IsSpace(*psz))
|
while (IsSpace(*psz))
|
||||||
|
@ -39,7 +39,7 @@ void base_blob<BITS>::SetHex(const char* psz)
|
||||||
size_t digits = 0;
|
size_t digits = 0;
|
||||||
while (::HexDigit(psz[digits]) != -1)
|
while (::HexDigit(psz[digits]) != -1)
|
||||||
digits++;
|
digits++;
|
||||||
unsigned char* p1 = (unsigned char*)data;
|
unsigned char* p1 = (unsigned char*)m_data;
|
||||||
unsigned char* pend = p1 + WIDTH;
|
unsigned char* pend = p1 + WIDTH;
|
||||||
while (digits > 0 && p1 < pend) {
|
while (digits > 0 && p1 < pend) {
|
||||||
*p1 = ::HexDigit(psz[--digits]);
|
*p1 = ::HexDigit(psz[--digits]);
|
||||||
|
|
|
@ -18,11 +18,11 @@ class base_blob
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
static constexpr int WIDTH = BITS / 8;
|
static constexpr int WIDTH = BITS / 8;
|
||||||
uint8_t data[WIDTH];
|
uint8_t m_data[WIDTH];
|
||||||
public:
|
public:
|
||||||
base_blob()
|
base_blob()
|
||||||
{
|
{
|
||||||
memset(data, 0, sizeof(data));
|
memset(m_data, 0, sizeof(m_data));
|
||||||
}
|
}
|
||||||
|
|
||||||
explicit base_blob(const std::vector<unsigned char>& vch);
|
explicit base_blob(const std::vector<unsigned char>& vch);
|
||||||
|
@ -30,17 +30,17 @@ public:
|
||||||
bool IsNull() const
|
bool IsNull() const
|
||||||
{
|
{
|
||||||
for (int i = 0; i < WIDTH; i++)
|
for (int i = 0; i < WIDTH; i++)
|
||||||
if (data[i] != 0)
|
if (m_data[i] != 0)
|
||||||
return false;
|
return false;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetNull()
|
void SetNull()
|
||||||
{
|
{
|
||||||
memset(data, 0, sizeof(data));
|
memset(m_data, 0, sizeof(m_data));
|
||||||
}
|
}
|
||||||
|
|
||||||
inline int Compare(const base_blob& other) const { return memcmp(data, other.data, sizeof(data)); }
|
inline int Compare(const base_blob& other) const { return memcmp(m_data, other.m_data, sizeof(m_data)); }
|
||||||
|
|
||||||
friend inline bool operator==(const base_blob& a, const base_blob& b) { return a.Compare(b) == 0; }
|
friend inline bool operator==(const base_blob& a, const base_blob& b) { return a.Compare(b) == 0; }
|
||||||
friend inline bool operator!=(const base_blob& a, const base_blob& b) { return a.Compare(b) != 0; }
|
friend inline bool operator!=(const base_blob& a, const base_blob& b) { return a.Compare(b) != 0; }
|
||||||
|
@ -53,32 +53,32 @@ public:
|
||||||
|
|
||||||
unsigned char* begin()
|
unsigned char* begin()
|
||||||
{
|
{
|
||||||
return &data[0];
|
return &m_data[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned char* end()
|
unsigned char* end()
|
||||||
{
|
{
|
||||||
return &data[WIDTH];
|
return &m_data[WIDTH];
|
||||||
}
|
}
|
||||||
|
|
||||||
const unsigned char* begin() const
|
const unsigned char* begin() const
|
||||||
{
|
{
|
||||||
return &data[0];
|
return &m_data[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
const unsigned char* end() const
|
const unsigned char* end() const
|
||||||
{
|
{
|
||||||
return &data[WIDTH];
|
return &m_data[WIDTH];
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int size() const
|
unsigned int size() const
|
||||||
{
|
{
|
||||||
return sizeof(data);
|
return sizeof(m_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t GetUint64(int pos) const
|
uint64_t GetUint64(int pos) const
|
||||||
{
|
{
|
||||||
const uint8_t* ptr = data + pos * 8;
|
const uint8_t* ptr = m_data + pos * 8;
|
||||||
return ((uint64_t)ptr[0]) | \
|
return ((uint64_t)ptr[0]) | \
|
||||||
((uint64_t)ptr[1]) << 8 | \
|
((uint64_t)ptr[1]) << 8 | \
|
||||||
((uint64_t)ptr[2]) << 16 | \
|
((uint64_t)ptr[2]) << 16 | \
|
||||||
|
@ -92,13 +92,13 @@ public:
|
||||||
template<typename Stream>
|
template<typename Stream>
|
||||||
void Serialize(Stream& s) const
|
void Serialize(Stream& s) const
|
||||||
{
|
{
|
||||||
s.write((char*)data, sizeof(data));
|
s.write((char*)m_data, sizeof(m_data));
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename Stream>
|
template<typename Stream>
|
||||||
void Unserialize(Stream& s)
|
void Unserialize(Stream& s)
|
||||||
{
|
{
|
||||||
s.read((char*)data, sizeof(data));
|
s.read((char*)m_data, sizeof(m_data));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue