ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Parse UINT64 as hex.

Browse Source
This commit is contained in:
Arthur Britto
2012-10-05 18:25:33 -07:00
parent b1e147200c
commit 95d1127dad
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SerializedObject.cpp
View File

@@ -939,7 +939,7 @@ std::auto_ptr<STObject> STObject::parseJson(const Json::Value& object, SField::r
case STI_UINT64:
if (value.isString())
data.push_back(new STUInt64(field, lexical_cast_st<uint64>(value.asString())));
data.push_back(new STUInt64(field, uintFromHex(value.asString())));
else if (value.isInt())
data.push_back(new STUInt64(field,
range_check_cast<uint64>(value.asInt(), 0, 18446744073709551615ull)));

11
src/utils.cpp
View File

@@ -2,6 +2,7 @@
#include "uint256.h"
#include <boost/asio.hpp>
#include <boost/foreach.hpp>
#include <boost/regex.hpp>
//
@@ -67,6 +68,16 @@ std::vector<unsigned char> strUnHex(const std::string& strSrc)
return strCopy(strTmp);
}
uint64_t uintFromHex(const std::string& strSrc)
{
uint64_t uValue = 0;
BOOST_FOREACH(char c, strSrc)
uValue = (uValue << 4) | charUnHex(c);
return uValue;
}
//
// Misc string
//

2
src/utils.h
View File

@@ -162,6 +162,8 @@ bool isZero(Iterator first, int iSize)
int charUnHex(char cDigit);
void strUnHex(std::string& strDst, const std::string& strSrc);
uint64_t uintFromHex(const std::string& strSrc);
std::vector<unsigned char> strUnHex(const std::string& strSrc);
std::vector<unsigned char> strCopy(const std::string& strSrc);