bintree.c

@@ -22,7 +22,7 @@ TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFc
 		newNode->data = malloc(dataSize);
 		newNode->left = NULL;
 		newNode->right = NULL;
-		memcpy(newNode->data, data, dataSize);
+		strcpy(newNode->data, data);
 		if(isDuplicate)
 			*isDuplicate = 0;
 		return newNode;
@@ -52,30 +52,28 @@ 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)
 {
+	printf("nextTreeData wurde gecallt!\n");
 	if(root)
 	{
-		stackRoot = addTreeToStack(stackRoot, root);
+		addTreeToStack(stackRoot, root);
+		printf("Baum wurde geladen!\n");
 	}
-	void *stackBuffer = top(stackRoot);
+	void *buffer = pop(stackRoot);
-	stackRoot = pop(stackRoot);
+	printf("neuer Eintrag wurde geholt: %x\n", buffer);
-	//void *buffer = (stackBuffer->stackData);
+	return buffer;
-	//printf("neuer Eintrag wurde geholt: %x\n", buffer);
-	//return buffer;
-	return stackBuffer;
 }
 // Adds all Treenode-Datas of a root into a stack ordered from left to right
-StackNode *addTreeToStack(StackNode *start, TreeNode *root)
+void addTreeToStack(StackNode *start, TreeNode *root)
 {
 	if(root->left)
 	{
-		start = addTreeToStack(start, root->left);
+		addTreeToStack(start, root->left);
 	}
-	start = push(start, root->data);
+	push(start, root->data);
 	if(root->right)
 	{
-		start = addTreeToStack(start, root->right);
+		addTreeToStack(start, root->right);
 	}
-	return start;
 }
 
 // Releases all memory resources (including data copies).

bintree.h

@@ -26,5 +26,5 @@ void clearTree(TreeNode *root);
 // Returns the number of entries in the tree given by root.
 unsigned int treeSize(const TreeNode *root);
 // Adds all Treenode-Datas of a root into a stack ordered from left to right
-StackNode *addTreeToStack(StackNode *start, TreeNode *root);
+void addTreeToStack(StackNode *start, TreeNode *root);
 #endif

highscores.txt

@@ -1,9 +0,0 @@
-HeldDerSteine;69
-Gunter11;121
-MaxiMustermann;316
-MillaMusterfrau;420
-testspieler68;2996
-testspieler69;2997
-testspieler67;2997
-testspieler1;2997
-testspieler68;4991

main.c

@@ -84,5 +84,6 @@ int main(int argc, char *argv[])
 
         exitCode = EXIT_SUCCESS;
     }
+
     return exitCode;
 }

stack.c

@@ -1,5 +1,4 @@
 #include <stdlib.h>
-#include <stdio.h>
 #include "stack.h"
 
 //TODO: grundlegende Stackfunktionen implementieren:
@@ -41,9 +40,7 @@ StackNode *pop(StackNode *stack)
         free(temp);
         temp = NULL;
         return stack;
-    } 
+    } else {
-	else 
-	{
         return NULL;
     }
 }