From 219c3e5d0c097282ac2546ebc0f1c31c9e60fa43 Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Wed, 12 Dec 2018 21:54:46 +0000 Subject: [PATCH] cleanup atree --- lib/jsw/jsw_atree.c | 8 +++++--- lib/jsw/jsw_atree.h | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/jsw/jsw_atree.c b/lib/jsw/jsw_atree.c index ff52bcb..82c24ca 100644 --- a/lib/jsw/jsw_atree.c +++ b/lib/jsw/jsw_atree.c @@ -16,6 +16,8 @@ #include "jsw.h" #include +#include +#include #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 f0fe7d9..7274ba0 100644 --- 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 ); -- 2.40.0