1 files changed, 15 insertions, 17 deletions

diff --git a/src/red-black-tree.c b/src/red-black-tree.c
index 7c2d2c1..5ae0f31 100644
--- a/src/red-black-tree.c
+++ b/src/red-black-tree.c
@@ -6,8 +6,6 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include "util.h"
-
 /* The authors of this work have released all rights to it and placed it
 in the public domain under the Creative Commons CC0 1.0 waiver
 (http://creativecommons.org/publicdomain/zero/1.0/).
@@ -27,22 +25,22 @@ enum rbtree_node_color { RED,
                              BLACK };
 
 typedef struct rbtree_node_t {
-        void *                 key;
-        void *                 value;
-        struct rbtree_node_t * left;
-        struct rbtree_node_t * right;
-        struct rbtree_node_t * parent;
+        void                  *key;
+        void                  *value;
+        struct rbtree_node_t  *left;
+        struct rbtree_node_t  *right;
+        struct rbtree_node_t  *parent;
         enum rbtree_node_color color;
-} * rbtree_node;
+} *rbtree_node;
 
 typedef struct rbtree_t {
         rbtree_node root;
-} * rbtree;
+} *rbtree;
 
 typedef int (*compare_func)(void *left, void *right);
 
-rbtree rbtree_create();
-void * rbtree_lookup(rbtree t, void *key, compare_func compare);
+rbtree rbtree_create(void);
+void  *rbtree_lookup(rbtree t, void *key, compare_func compare);
 void   rbtree_insert(rbtree t, void *key, void *value, compare_func compare);
 void   rbtree_delete(rbtree t, void *key, compare_func compare);
 
@@ -187,7 +185,7 @@ verify_property_5_helper(node n, int black_count, int *path_black_count)
 }
 
 rbtree
-rbtree_create()
+rbtree_create(void)
 {
         rbtree t = malloc(sizeof *t);
         t->root  = NULL;
@@ -538,8 +536,8 @@ static void print_tree_helper(rbtree_node n, int indent);
 int
 compare_int(void *leftp, void *rightp)
 {
-        int left  = (int) leftp;
-        int right = (int) rightp;
+        long left  = (long) leftp;
+        long right = (long) rightp;
         if ( left < right )
                 return -1;
         else if ( left > right )
@@ -575,16 +573,16 @@ print_tree_helper(rbtree_node n, int indent)
         for ( i = 0; i < indent; i++ )
                 fputs(" ", stdout);
         if ( n->color == BLACK )
-                printf("%d\n", (int) n->key);
+                printf("%ld\n", (long) n->key);
         else
-                printf("<%d>\n", (int) n->key);
+                printf("<%ld>\n", (long) n->key);
         if ( n->left != NULL ) {
                 print_tree_helper(n->left, indent + INDENT_STEP);
         }
 }
 
 int
-main()
+main(void)
 {
         int    i;
         rbtree t = rbtree_create();