cleanup atree

diff --git a/lib/jsw/jsw_atree.c b/lib/jsw/jsw_atree.c
index ff52bcbc0c8933b54072f5ac059eb1585e4320a7..82c24ca81aa1bef809df5b3bfca26d83a29c269b 100644 (file)
--- a/lib/jsw/jsw_atree.c
+++ b/lib/jsw/jsw_atree.c
@@ -16,6 +16,8 @@
 #include "jsw.h"
 
 #include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 
 #ifndef HEIGHT_LIMIT
 #define HEIGHT_LIMIT 64 /* Tallest allowable tree */
@@ -134,12 +136,12 @@ void jsw_adelete ( jsw_atree_t *tree )
   free ( tree );
 }
 
-void *jsw_afind ( jsw_atree_t *tree, void *data )
-{
+void *jsw_afind ( jsw_atree_t *tree, void *data) {
   jsw_anode_t *it = tree->root;
+  int cmp = 0;
 
   while ( it != tree->nil ) {
-    int cmp = tree->cmp ( it->data, data );
+    cmp = tree->cmp(it->data, data);
 
     if ( cmp == 0 )
       break;

diff --git a/lib/jsw/jsw_atree.h b/lib/jsw/jsw_atree.h
index f0fe7d9562719f9a2d6fe7ea9fcd2e7153780ee1..7274ba016f7f7e11dbf2e6db990ab6d6ea423e13 100644 (file)
--- a/lib/jsw/jsw_atree.h
+++ b/lib/jsw/jsw_atree.h
@@ -35,9 +35,9 @@ typedef void  (*rel_f) ( void *p );
 
 /* Andersson tree functions */
 jsw_atree_t *jsw_anew (
-               int (cmp)(const void *, const void *),
+               int (*cmp)(const void *, const void *),
                void *(dup)(void *),
-               void (rel)(void *)
+               void (*rel)(void *)
                );
 void         jsw_adelete ( jsw_atree_t *tree );
 void        *jsw_afind ( jsw_atree_t *tree, void *data );