neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Integrate @JoelKatz's optimized ToHex (#562) into current HexStr function

Browse Source
This commit is contained in:
Wladimir J. van der Laan 2012-04-21 20:15:25 +02:00
parent 00b9c0f4b2
commit 88dc2d6c6a
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/test/util_tests.cpp
View File

@ -88,8 +88,19 @@ BOOST_AUTO_TEST_CASE(util_HexStr)
BOOST_CHECK_EQUAL( BOOST_CHECK_EQUAL(
HexStr(ParseHex_expected, ParseHex_expected + 5, true), HexStr(ParseHex_expected, ParseHex_expected + 5, true),
"04 67 8a fd b0"); "04 67 8a fd b0");
BOOST_CHECK_EQUAL(
HexStr(ParseHex_expected, ParseHex_expected, true),
"");
std::vector<unsigned char> ParseHex_vec(ParseHex_expected, ParseHex_expected + 5);
BOOST_CHECK_EQUAL(
HexStr(ParseHex_vec, true),
"04 67 8a fd b0");
} }
BOOST_AUTO_TEST_CASE(util_DateTimeStrFormat) BOOST_AUTO_TEST_CASE(util_DateTimeStrFormat)
{ {
BOOST_CHECK_EQUAL(DateTimeStrFormat("%x %H:%M:%S", 0), "01/01/70 00:00:00"); BOOST_CHECK_EQUAL(DateTimeStrFormat("%x %H:%M:%S", 0), "01/01/70 00:00:00");

23
src/util.h
View File

@ -361,15 +361,20 @@ inline int64 abs64(int64 n)
template<typename T> template<typename T>
std::string HexStr(const T itbegin, const T itend, bool fSpaces=false) std::string HexStr(const T itbegin, const T itend, bool fSpaces=false)
{ {
if (itbegin == itend) std::vector<char> rv;
return ""; static char hexmap[16] = { '0', '1', '2', '3', '4', '5', '6', '7',
const unsigned char* pbegin = (const unsigned char*)&itbegin[0]; '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
const unsigned char* pend = pbegin + (itend - itbegin) * sizeof(itbegin[0]); rv.reserve((itend-itbegin)*3);
std::string str; for(T it = itbegin; it < itend; ++it)
str.reserve((pend-pbegin) * (fSpaces ? 3 : 2)); {
for (const unsigned char* p = pbegin; p != pend; p++) unsigned char val = (unsigned char)(*it);
str += strprintf((fSpaces && p != pend-1 ? "%02x " : "%02x"), *p); if(fSpaces && it != itbegin)
return str; rv.push_back(' ');
rv.push_back(hexmap[val>>4]);
rv.push_back(hexmap[val&15]);
}
return std::string(rv.begin(), rv.end());
} }
inline std::string HexStr(const std::vector<unsigned char>& vch, bool fSpaces=false) inline std::string HexStr(const std::vector<unsigned char>& vch, bool fSpaces=false)