ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups.

Browse Source
This commit is contained in:
JoelKatz
2012-05-26 15:11:10 -07:00
parent 2866cec281
commit d442534c70
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/SHAMap.cpp
View File

@@ -124,8 +124,9 @@ SHAMapTreeNode* SHAMap::walkToPointer(const uint256& id)
while (!inNode->isLeaf())
{
int branch = inNode->selectBranch(id);
if (inNode->isEmptyBranch(branch)) return NULL;
inNode = getNodePointer(inNode->getChildNodeID(branch), inNode->getChildHash(branch));
const uint256& nextHash = inNode->getChildHash(branch);
if (!nextHash) return NULL;
inNode = getNodePointer(inNode->getChildNodeID(branch), nextHash);
if (!inNode) throw SHAMapException(MissingNode);
}
return (inNode->getTag() == id) ? inNode : NULL;

6
src/SHAMap.h
View File

@@ -179,10 +179,14 @@ public:
// inner node functions
bool isInnerNode() const { return !mItem; }
bool setChildHash(int m, const uint256& hash);
const uint256& getChildHash(int m) const;
bool isEmptyBranch(int m) const { return !mHashes[m]; }
int getBranchCount() const;
void makeInner();
const uint256& getChildHash(int m) const
{
assert((m >= 0) && (m < 16) && (mType == tnINNER));
return mHashes[m];
}
// item node function
bool hasItem() const { return !!mItem; }

5
src/SHAMapNodes.cpp
View File

@@ -370,9 +370,4 @@ bool SHAMapTreeNode::setChildHash(int m, const uint256 &hash)
return updateHash();
}
const uint256& SHAMapTreeNode::getChildHash(int m) const
{
assert((m >= 0) && (m < 16) && (mType == tnINNER));
return mHashes[m];
}
// vim:ts=4