From ac5ec35a6e222f635912f6a7eaf3c036c71367b6 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 26 Aug 2008 08:27:02 +0200
Subject: enable -Wpointer-arith, -Wstrict-prototypes

Also enable -Wunused-parameter - this forces us to add the gcc
"unused" attribute to a lot of parameters (mostly library callback
functions), but it's worth it during code refactorizations.
---
 src/tree.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/tree.c')

diff --git a/src/tree.c b/src/tree.c
index 4b212cca6..40dc4224c 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -171,8 +171,7 @@ _SplitNode(TreeNode * node)
 
 static
 void
-_InsertNodeAndData(Tree * tree, 
-		   TreeNode * node,
+_InsertNodeAndData(TreeNode * node,
 		   int pos,
 		   TreeNode * newNode,
 		   TreeKeyData keyData)
@@ -204,8 +203,7 @@ _InsertNodeAndData(Tree * tree,
 
 static
 TreeKeyData
-_AddDataToSplitNodes(Tree * tree,
-		     TreeNode * lessNode, 
+_AddDataToSplitNodes(TreeNode * lessNode,
 		     TreeNode * moreNode,
 		     int pos,
 		     TreeNode * newNode,
@@ -217,7 +215,7 @@ _AddDataToSplitNodes(Tree * tree,
 
 	if (pos <= lessNode->count)
 	{
-		_InsertNodeAndData(tree, lessNode, pos, newNode, keyData);
+		_InsertNodeAndData(lessNode, pos, newNode, keyData);
 		lessNode->count--;
 		retKeyData = lessNode->keyData[lessNode->count];
 		_ClearKeyData(&(lessNode->keyData[lessNode->count]));
@@ -277,8 +275,7 @@ _InsertAt(TreeIterator * iter, TreeKeyData keyData)
 			TreeNode * newNode = _SplitNode(node);
 
 			/* insert data in split nodes */
-			keyData = _AddDataToSplitNodes(iter->tree,
-						       node, 
+			keyData = _AddDataToSplitNodes(node,
 						       newNode,
 						       pos,
 						       insertNode,
@@ -306,8 +303,7 @@ _InsertAt(TreeIterator * iter, TreeKeyData keyData)
 		else
 		{
 			/* insert the data and newNode */
-			_InsertNodeAndData(iter->tree, 
-					   node,
+			_InsertNodeAndData(node,
 					   pos,
 					   insertNode,
 					   keyData);
-- 
cgit v1.2.3


From 6982a829e22d2bc7cf7c829c4430a4ea6f5bc7fa Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 29 Aug 2008 09:01:53 +0200
Subject: pass constant pointers

And again, convert arguments to const.
---
 src/tree.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/tree.c')

diff --git a/src/tree.c b/src/tree.c
index 40dc4224c..d583aee7c 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -71,7 +71,7 @@ _ClearKeyData(TreeKeyData * keyData)
 
 static
 int
-_FindPosition(Tree * tree, TreeNode * node, void * key, int * pos)
+_FindPosition(Tree * tree, TreeNode * node, const void * key, int * pos)
 {
 #ifdef USE_BINARY_SEARCH
 	int low = 0;
@@ -113,7 +113,7 @@ _FindPosition(Tree * tree, TreeNode * node, void * key, int * pos)
 
 static
 int
-_Find(TreeIterator * iter, void * key)
+_Find(TreeIterator * iter, const void * key)
 {
 	while (1)
 	{
@@ -680,7 +680,7 @@ RemoveFromTreeByIterator(Tree * tree, TreeIterator * iter)
 }
 
 int
-FindInTree(Tree * tree, void * key, TreeIterator * iter)
+FindInTree(Tree * tree, const void * key, TreeIterator * iter)
 {
 	TreeIterator i;
 	
-- 
cgit v1.2.3