highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-20 23:29:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3076 from lano1106/uint256_util

Browse Source 
Make util phexdigit array reusable
This commit is contained in:
Wladimir J. van der Laan
2013-11-04 05:55:37 -08:00
parent 97f844dd95 f171ec0c7d
commit bac72640ee
5 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/util.cpp
View File

@@ -460,7 +460,7 @@ bool ParseMoney(const char* pszIn, int64& nRet)
}
static const signed char phexdigit[256] =
const signed char p_util_hexdigit[256] =
{ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
@@ -480,9 +480,9 @@ static const signed char phexdigit[256] =
bool IsHex(const string& str)
{
BOOST_FOREACH(unsigned char c, str)
BOOST_FOREACH(char c, str)
{
if (phexdigit[c] < 0)
if (HexDigit(c) < 0)
return false;
}
return (str.size() > 0) && (str.size()%2 == 0);
@@ -496,11 +496,11 @@ vector<unsigned char> ParseHex(const char* psz)
{
while (isspace(*psz))
psz++;
signed char c = phexdigit[(unsigned char)*psz++];
signed char c = HexDigit(*psz++);
if (c == (signed char)-1)
break;
unsigned char n = (c << 4);
c = phexdigit[(unsigned char)*psz++];
c = HexDigit(*psz++);
if (c == (signed char)-1)
break;
n |= c;