X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Favl.h;h=fe90302fb31cb30e072234979ca66f6b4401051d;hb=0c8f1d240a54b168552787faa35f1e871a440fb6;hp=651b9026d809519c30a678df0b692a48df5428a1;hpb=7e6ad5100c2702b1d56a285bdfb341ddf38c0d76;p=openldap

diff --git a/include/avl.h b/include/avl.h
index 651b9026d8..fe90302fb3 100644
--- a/include/avl.h
+++ b/include/avl.h
@@ -1,5 +1,13 @@
-/* avl.h - avl tree definitions */
 /*
+ * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted only
+ * as authorized by the OpenLDAP Public License.  A copy of this
+ * license is available at http://www.OpenLDAP.org/license.html or
+ * in file LICENSE in the top-level directory of the distribution.
+ */
+/* Portions
  * Copyright (c) 1993 Regents of the University of Michigan.
  * All rights reserved.
  *
@@ -10,6 +18,7 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  */
+/* avl.h - avl tree definitions */
 
 
 #ifndef _AVL
@@ -23,12 +32,15 @@
 
 LDAP_BEGIN_DECL
 
-typedef struct avlnode {
-	caddr_t		avl_data;
-	signed char		avl_bf;
+typedef struct avlnode Avlnode;
+
+#ifdef AVL_INTERNAL
+struct avlnode {
+	void*		avl_data;
+	signed int		avl_bf;
 	struct avlnode	*avl_left;
 	struct avlnode	*avl_right;
-} Avlnode;
+};
 
 #define NULLAVL	((Avlnode *) NULL)
 
@@ -41,48 +53,47 @@ typedef struct avlnode {
 #define avl_getone(x)	((x) == 0 ? 0 : (x)->avl_data)
 #define avl_onenode(x)	((x) == 0 || ((x)->avl_left == 0 && (x)->avl_right == 0))
 
-/* looks like this function pointer is not used consistently */
-/* typedef int	(*IFP)LDAP_P((caddr_t, caddr_t)); */
-typedef int	(*IFP)();
+#endif /* AVL_INTERNALS */
+
+typedef int		(*AVL_APPLY) LDAP_P((void *, void*));
+typedef int		(*AVL_CMP) LDAP_P((void*, void*));
+typedef int		(*AVL_DUP) LDAP_P((void*, void*));
+typedef void	(*AVL_FREE) LDAP_P((void*));
 
-LDAP_F int
-avl_free LDAP_P(( Avlnode *root, IFP dfree ));
+LDAP_F( int )
+avl_free LDAP_P(( Avlnode *root, AVL_FREE dfree ));
 
-LDAP_F int
-avl_insert LDAP_P((Avlnode **, caddr_t, IFP, IFP));
+LDAP_F( int )
+avl_insert LDAP_P((Avlnode **, void*, AVL_CMP, AVL_DUP));
 
-LDAP_F caddr_t
-avl_delete LDAP_P((Avlnode **, caddr_t, IFP));
+LDAP_F( void* )
+avl_delete LDAP_P((Avlnode **, void*, AVL_CMP));
 
-LDAP_F caddr_t
-avl_find LDAP_P((Avlnode *, caddr_t, IFP));
+LDAP_F( void* )
+avl_find LDAP_P((Avlnode *, void*, AVL_CMP));
 
-LDAP_F caddr_t
-avl_find_lin LDAP_P((Avlnode *, caddr_t, IFP));
+LDAP_F( void* )
+avl_find_lin LDAP_P((Avlnode *, void*, AVL_CMP));
 
-LDAP_F caddr_t
+#ifdef AVL_NONREENTRANT
+LDAP_F( void* )
 avl_getfirst LDAP_P((Avlnode *));
 
-#ifdef AVL_REENTRANT
-/* ??? avl.c does not provide this version ??? */
-LDAP_F caddr_t
-avl_getnext LDAP_P((Avlnode *, caddr_t ));
-#else
-LDAP_F caddr_t
+LDAP_F( void* )
 avl_getnext LDAP_P((void));
 #endif
 
-LDAP_F int
-avl_dup_error LDAP_P((void));
+LDAP_F( int )
+avl_dup_error LDAP_P((void*, void*));
 
-LDAP_F int
-avl_dup_ok LDAP_P((void));
+LDAP_F( int )
+avl_dup_ok LDAP_P((void*, void*));
 
-LDAP_F int
-avl_apply LDAP_P((Avlnode *, IFP, caddr_t, int, int));
+LDAP_F( int )
+avl_apply LDAP_P((Avlnode *, AVL_APPLY, void*, int, int));
 
-LDAP_F int
-avl_prefixapply LDAP_P((Avlnode *, caddr_t, IFP, caddr_t, IFP, caddr_t, int));
+LDAP_F( int )
+avl_prefixapply LDAP_P((Avlnode *, void*, AVL_CMP, void*, AVL_CMP, void*, int));
 
 /* apply traversal types */
 #define AVL_PREORDER	1