diff --git a/src/sys/ubixfsv2/btree.cpp b/src/sys/ubixfsv2/btree.cpp index 74fb015..a2e4185 100644 --- a/src/sys/ubixfsv2/btree.cpp +++ b/src/sys/ubixfsv2/btree.cpp @@ -41,7 +41,7 @@ * Find the leaf node the inode goes into */ assert(bnode->used); -// cout << "---Inserting " << inode->name << "@" << inode << endl; + cout << "---Inserting " << inode->name << "@" << inode << endl; while (bnode != NULL && !bnode->leafNode) { if (strcmp(inode->name, bnode->keys[0]) < 0) bnode = (bNode *)bnode->childHead[0]; @@ -61,7 +61,8 @@ /* * */ -assert(bnode->leafNode); +assert(bnode); +if (bnode->leafNode != true) cout << "leafnode!=true" << endl; assert(inode); cout << inode->name << " ~~ " << bnode->keys[0] << " == "; @@ -278,6 +279,13 @@ return; } // bTree::splitNode +void +bTree::insertNode(bNode * node, const char * key, void * data) { + if (node == NULL || key == NULL || data == NULL) return; + unsigned int curSlot = 0; + +} // bTree::insertNode + bNode * bTree::allocEmptyNode(void) { bNode * newNode = (bNode *)malloc(sizeof(bNode)); diff --git a/src/sys/ubixfsv2/btree.h b/src/sys/ubixfsv2/btree.h index 72365de..1e487dd 100644 --- a/src/sys/ubixfsv2/btree.h +++ b/src/sys/ubixfsv2/btree.h @@ -31,6 +31,7 @@ ubixfsInode * inodeSearch(ubixfsInode *, const char *); void splitNode(bNode *); bNode * allocEmptyNode(void); + void insertNode(bNode *, const char *, void *); public: bTree(ubixfsInode *); bTree(void) : root(NULL) { };