Added nextTreeData and iterateThroughTree in bintree.c

bintree.c

@@ -12,7 +12,36 @@
 // if isDuplicate is NULL, otherwise ignores duplicates and sets isDuplicate to 1 (or to 0 if a new entry is added).
 TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFctType compareFct, int *isDuplicate)
 {
-
+	if(!root)
+	{
+		root = malloc(sizeof(node));
+		*node newNode;
+		*newNode.data = malloc(dataSize);
+		strcpy(*newNode.data, data);
+		*newNode.left = NULL;
+		*newNode.right = NULL;
+		if(isDuplicate)
+			*isDuplicate = 0;
+		return newNode;
+	}
+	if(compareFct(*data, *root->data) > 0)
+	{
+		*right = addToTree(right, data, dataSize, compareFct, isDuplicate);
+	}
+	else if(compareFct(*data, *root->data) < 0)
+	{
+		*left = addToTree(right, data, dataSize, compareFct, isDuplicate);
+	}
+	else
+	{
+		if(!isDuplicate)
+			*left = addToTree(right, data, dataSize, compareFct, isDuplicate);
+		else
+		{
+			*isDuplicate = 1;
+		}
+	}
+	return root;
 }
 
 // Iterates over the tree given by root. Follows the usage of strtok. If tree is NULL, the next entry of the last tree given is returned in ordering direction.
@@ -20,17 +49,50 @@ TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFc
 // push the top node and push all its left nodes.
 void *nextTreeData(TreeNode *root)
 {
+	StackNode *stackRoot = NULL;//Generates a new, empty stack
+	stackRoot = iterateThroughTree(root, stackRoot); //Fills the stack via the helping function iterateThroughTree
+	stackNode * tempBuffer = pop(stackRoot);
+	clearStack(stackRoot);
+	return tempBuffer;
+}
 
+//Function to aid nextTreeData
+StackNode *iterateThroughTree(TreeNode *root, StackNode *stackRoot)
+{
+	if(!root)
+	{
+		return stackRoot;
+	}
+	stackRoot = iterateThroughTree(root->left, stackRoot);
+	stackNode = push(stackNode, root->data);
+	stackRoot = iterateThroughTree(root->right, stackRoot);
+	return stackRoot;
 }
 
 // Releases all memory resources (including data copies).
 void clearTree(TreeNode *root)
 {
-
+	if(left)
+		clearTree(left);
+	if(right)
+		clearTree(right);
+	free(data);
+	data = NULL;
+	free(root);
+	root = NULL;
 }
 
 // Returns the number of entries in the tree given by root.
 unsigned int treeSize(const TreeNode *root)
 {
-
+	if(root)
+	{
+		unsigned int tempSize = 0;
+		if(left)
+			tempSize += treeSize(left);
+		if(right)
+			tempSize += treeSize(right);
+		return tempSize + 1;
+	}
+	return 0;
 }

bintree.h

@@ -23,5 +23,6 @@ void *nextTreeData(TreeNode *root);
 void clearTree(TreeNode *root);
 // Returns the number of entries in the tree given by root.
 unsigned int treeSize(const TreeNode *root);
-
+//Function to aid nextTreeData
+StackNode iterateThroughTree(TreeNode *root, StackNode stackRoot);
 #endif