oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

deletion of tree nodes now works.

Browse Source 
next is to clean up the code and make obvious optimizations

git-svn-id: https://svn.musicpd.org/mpd/trunk@4502 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2006-08-01 00:31:09 +00:00
parent 03fdf503f4
commit c5cab16509
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/tree.c
View File

@ -355,6 +355,7 @@ _MergeNodes(TreeNode * lessNode, TreeNode * moreNode)
int j = lessNode->dataCount; int j = lessNode->dataCount;
assert((lessNode->dataCount + moreNode->dataCount) <= DATA_PER_NODE); assert((lessNode->dataCount + moreNode->dataCount) <= DATA_PER_NODE);
assert(lessNode->children[j] == NULL);
for(; i < moreNode->dataCount; i++,j++) for(; i < moreNode->dataCount; i++,j++)
{ {
@ -444,6 +445,7 @@ _DeleteAt(TreeIterator * iter)
{ {
TreeNode ** child; TreeNode ** child;
int pos; int pos;
// XXX : this find is unneccesary!
if (_FindPositionInNode(iter->tree, if (_FindPositionInNode(iter->tree,
node->parent, node->parent,
tempData, tempData,
@ -477,11 +479,13 @@ _DeleteAt(TreeIterator * iter)
for(; i < (*child)->dataCount-1; i++) for(; i < (*child)->dataCount-1; i++)
{ {
(*child)->data[i] = (*child)->data[i+1]; (*child)->data[i] = (*child)->data[i+1];
(*child)->children[i+1] = (*child)->children[i] =
(*child)->children[i+2]; (*child)->children[i+1];
} }
(*child)->children[(*child)->dataCount--] =NULL; (*child)->children[i] = (*child)->children[i+1];
(*child)->data[(*child)->dataCount] = NULL; (*child)->children[i+1] =NULL;
(*child)->data[i] = NULL;
(*child)->dataCount--;
} }
else if (pos > 0 && else if (pos > 0 &&
(*(child-1))->dataCount>(CHILDREN_PER_NODE/2)) (*(child-1))->dataCount>(CHILDREN_PER_NODE/2))
@ -493,6 +497,7 @@ _DeleteAt(TreeIterator * iter)
node->data[i] = node->data[i-1]; node->data[i] = node->data[i-1];
node->children[i+1] = node->children[i]; node->children[i+1] = node->children[i];
} }
node->children[1] = node->children[0];
node->data[0] = node->parent->data[pos-1]; node->data[0] = node->parent->data[pos-1];
node->children[0] = node->children[0] =
(*child)->children[(*child)->dataCount]; (*child)->children[(*child)->dataCount];
@ -663,7 +668,7 @@ InsertIntoTree(Tree * tree, void * data)
return 1; return 1;
} }
void int
DeleteFromTree(Tree * tree, void * data) DeleteFromTree(Tree * tree, void * data)
{ {
TreeIterator iter; TreeIterator iter;
@ -672,5 +677,8 @@ DeleteFromTree(Tree * tree, void * data)
if (_Find(&iter, data)) if (_Find(&iter, data))
{ {
_DeleteAt(&iter); _DeleteAt(&iter);
return 1;
} }
return 0;
} }

2
src/tree.h
View File

@ -44,6 +44,6 @@ void * GetDataFromTreeIterator(TreeIterator * iter);
int InsertIntoTree(Tree * tree, void * data); int InsertIntoTree(Tree * tree, void * data);
void DeleteFromTree(Tree * tree, void * data); int DeleteFromTree(Tree * tree, void * data);
#endif #endif