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

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
Arthur Britto
2012-05-05 16:46:34 -07:00
parent f548e27e67 1c4a071062
commit 6174bd082a
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Serializer.cpp
View File

@@ -81,28 +81,31 @@ int Serializer::addRaw(const void *ptr, int len)
bool Serializer::get16(uint16& o, int offset) const bool Serializer::get16(uint16& o, int offset) const
{ {
if ((offset + 2) > mData.size()) return false; if ((offset + 2) > mData.size()) return false;
o = mData.at(offset++); const unsigned char *ptr = &mData[offset];
o <<= 8; o |= mData.at(offset); o = *ptr++; o <<= 8; o |= *ptr;
return true; return true;
} }
bool Serializer::get32(uint32& o, int offset) const bool Serializer::get32(uint32& o, int offset) const
{ {
if ((offset + 4) > mData.size()) return false; if ((offset + 4) > mData.size()) return false;
o=mData.at(offset++); const unsigned char *ptr = &mData[offset];
o<<=8; o |= mData.at(offset++); o <<= 8; o |= mData.at(offset++); o = *ptr++;
o<<=8; o |= mData.at(offset); o <<= 8; o |= *ptr++;
o <<= 8; o |= *ptr++;
o <<= 8; o |= *ptr;
return true; return true;
} }
bool Serializer::get64(uint64& o, int offset) const bool Serializer::get64(uint64& o, int offset) const
{ {
if ((offset + 8) > mData.size()) return false; if ((offset + 8) > mData.size()) return false;
o=mData.at(offset++); const unsigned char *ptr = &mData[offset];
o<<=8; o|= mData.at(offset++); o <<= 8; o |= mData.at(offset++); o = *ptr++;
o<<=8; o|= mData.at(offset++); o <<= 8; o |= mData.at(offset++); o <<= 8; o |= *ptr++; o <<= 8; o |= *ptr++;
o<<=8; o|= mData.at(offset++); o <<= 8; o |= mData.at(offset++); o <<= 8; o |= *ptr++; o <<= 8; o |= *ptr++;
o<<=8; o|= mData.at(offset); o <<= 8; o |= *ptr++; o <<= 8; o |= *ptr++;
o <<= 8; o |= *ptr;
return true; return true;
} }
@@ -259,7 +262,7 @@ int Serializer::addVL(const std::vector<unsigned char>& vector)
{ {
int ret = addRaw(encodeVL(vector.size())); int ret = addRaw(encodeVL(vector.size()));
addRaw(vector); addRaw(vector);
assert(mData.size() + (ret + vector.size() + encodeLengthLength(vector.size()))); assert(mData.size() == (ret + vector.size() + encodeLengthLength(vector.size())));
return ret; return ret;
} }