From 39d4899c5ab3a96a6cb3adb1bd7107a20a15d746 Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik@fiktivkod.org>
Date: Sun, 7 Nov 2010 11:46:28 +0100
Subject: [PATCH] rbtree: removed unneeded typedefs

---
 src/rbtree.c |  8 ++++----
 src/rbtree.h | 17 +++++++----------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/rbtree.c b/src/rbtree.c
index 18fb196..ba2f415 100644
--- a/src/rbtree.c
+++ b/src/rbtree.c
@@ -18,7 +18,7 @@
 #define is_red(n) ((n) != NULL && (n)->color == RB_RED)
 #define swap(n,d,q) ((n)->child[(n)->child[d] == (q)])
 
-static rbnode* node_alloc(uint key, void *data) {
+static rbnode* node_alloc(unsigned key, void *data) {
 	
 	rbnode *n = xmalloc(sizeof(rbnode));
 	
@@ -103,7 +103,7 @@ inline int rbtree_is_empty(rbtree *tree) {
 /*
  * Searches a tree by key.
  */
-rbnode* rbtree_search(rbtree *tree, uint key) {
+rbnode* rbtree_search(rbtree *tree, unsigned key) {
 	
 	rbnode *n;
 	
@@ -150,7 +150,7 @@ void rbtree_free(rbtree *tree) {
 	tree->root = NULL;
 }
 
-int rbtree_insert(rbtree *tree, uint key, void *data) {
+int rbtree_insert(rbtree *tree, unsigned key, void *data) {
 	
 	rbnode head = {0};
 	
@@ -223,7 +223,7 @@ done:
     return inserted;
 }
 
-int rbtree_delete(rbtree *tree, uint key) {
+int rbtree_delete(rbtree *tree, unsigned key) {
 	
 	rbnode head = {0};
 	
diff --git a/src/rbtree.h b/src/rbtree.h
index 3d80980..e632d6e 100644
--- a/src/rbtree.h
+++ b/src/rbtree.h
@@ -16,15 +16,12 @@
 
 #include <stddef.h>
 
-typedef unsigned char color_t;
-typedef unsigned int uint;
-
 /* node definition */
 typedef struct _rbn {
-	uint 		 key;
-    void        *data;
-	struct _rbn *child[2];
-	color_t      color;
+	unsigned      key;
+    void         *data;
+	struct _rbn  *child[2];
+	unsigned char color;
 } rbnode;
 
 typedef struct {
@@ -40,7 +37,7 @@ typedef struct {
 
 int rbtree_is_empty(rbtree *tree);
 
-rbnode* rbtree_search(rbtree *tree, uint key);
+rbnode* rbtree_search(rbtree *tree, unsigned key);
 
 rbnode* rbtree_cmp_search(rbtree *tree, const void *data);
 
@@ -48,8 +45,8 @@ void rbtree_walk(rbtree *tree, void (*action)(rbnode *));
 
 void rbtree_free(rbtree *tree);
 
-int rbtree_insert(rbtree *tree, uint key, void *data);
+int rbtree_insert(rbtree *tree, unsigned key, void *data);
 
-int rbtree_delete(rbtree *tree, uint key);
+int rbtree_delete(rbtree *tree, unsigned key);
 
 #endif /* __RBTREE_H */