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

Clean up STObject::set() for clarity

Browse Source
This commit is contained in:
Vinnie Falco
2013-06-09 14:12:28 -07:00
parent 3273625f61
commit 0b7e0b132a
1 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
modules/ripple_data/protocol/ripple_SerializedObject.cpp
View File

@@ -203,6 +203,8 @@ bool STObject::isFieldAllowed(SField::ref field)
return mType->getIndex(field) != -1;
}
// OLD
/*
bool STObject::set(SerializerIterator& sit, int depth)
{ // return true = terminated with end-of-object
mData.clear();
@@ -222,6 +224,51 @@ bool STObject::set(SerializerIterator& sit, int depth)
}
return false;
}
*/
// return true = terminated with end-of-object
bool STObject::set(SerializerIterator& sit, int depth)
{
bool reachedEndOfObject = false;
// Empty the destination buffer
//
mData.clear ();
// Consume data in the pipe until we run out or reach the end
//
while (!reachedEndOfObject && !sit.empty ())
{
int type;
int field;
// Get the metadata for the next field
//
sit.getFieldID(type, field);
reachedEndOfObject = (type == STI_OBJECT) && (field == 1);
if (!reachedEndOfObject)
{
// Figure out the field
//
SField::ref fn = SField::getField(type, field);
if (fn.isInvalid ())
{
WriteLog (lsWARNING, STObject) << "Unknown field: field_type=" << type << ", field_name=" << field;
throw std::runtime_error("Unknown field");
}
// Unflatten the field
//
giveObject (makeDeserializedObject (fn.fieldType, fn, sit, depth + 1));
}
}
return reachedEndOfObject;
}
UPTR_T<SerializedType> STObject::deserialize(SerializerIterator& sit, SField::ref name)
{