-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* avl.h - avl tree definitions */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
* 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
*/
-/* Portions
- * Copyright (c) 1993 Regents of the University of Michigan.
+/* Portions Copyright (c) 1993 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
* software without specific prior written permission. This software
* is provided ``as is'' without express or implied warranty.
*/
-/* avl.h - avl tree definitions */
#ifndef _AVL
LDAP_BEGIN_DECL
-typedef struct avlnode {
+typedef struct avlnode Avlnode;
+
+struct avlnode {
void* avl_data;
- signed char avl_bf;
+ signed int avl_bf;
struct avlnode *avl_left;
struct avlnode *avl_right;
-} Avlnode;
+};
+
+#ifdef AVL_INTERNAL
#define NULLAVL ((Avlnode *) NULL)
#define avl_getone(x) ((x) == 0 ? 0 : (x)->avl_data)
#define avl_onenode(x) ((x) == 0 || ((x)->avl_left == 0 && (x)->avl_right == 0))
+#endif /* AVL_INTERNALS */
+
typedef int (*AVL_APPLY) LDAP_P((void *, void*));
-typedef int (*AVL_CMP) LDAP_P((void*, void*));
+typedef int (*AVL_CMP) LDAP_P((const void*, const void*));
typedef int (*AVL_DUP) LDAP_P((void*, void*));
typedef void (*AVL_FREE) LDAP_P((void*));
-LDAP_F( int )
+LDAP_AVL_F( int )
avl_free LDAP_P(( Avlnode *root, AVL_FREE dfree ));
-LDAP_F( int )
+LDAP_AVL_F( int )
avl_insert LDAP_P((Avlnode **, void*, AVL_CMP, AVL_DUP));
-LDAP_F( void* )
+LDAP_AVL_F( void* )
avl_delete LDAP_P((Avlnode **, void*, AVL_CMP));
-LDAP_F( void* )
-avl_find LDAP_P((Avlnode *, void*, AVL_CMP));
+LDAP_AVL_F( void* )
+avl_find LDAP_P((Avlnode *, const void*, AVL_CMP));
+
+LDAP_AVL_F( Avlnode* )
+avl_find2 LDAP_P((Avlnode *, const void*, AVL_CMP));
-LDAP_F( void* )
-avl_find_lin LDAP_P((Avlnode *, void*, AVL_CMP));
+LDAP_AVL_F( void* )
+avl_find_lin LDAP_P((Avlnode *, const void*, AVL_CMP));
-LDAP_F( void* )
+#ifdef AVL_NONREENTRANT
+LDAP_AVL_F( void* )
avl_getfirst LDAP_P((Avlnode *));
-#ifdef AVL_REENTRANT
-/* ??? avl.c does not provide this version ??? */
-LDAP_F( void* )
-avl_getnext LDAP_P((Avlnode *, void* ));
-#else
-LDAP_F( void* )
+LDAP_AVL_F( void* )
avl_getnext LDAP_P((void));
#endif
-LDAP_F( int )
+LDAP_AVL_F( int )
avl_dup_error LDAP_P((void*, void*));
-LDAP_F( int )
+LDAP_AVL_F( int )
avl_dup_ok LDAP_P((void*, void*));
-LDAP_F( int )
+LDAP_AVL_F( int )
avl_apply LDAP_P((Avlnode *, AVL_APPLY, void*, int, int));
-LDAP_F( int )
+LDAP_AVL_F( int )
avl_prefixapply LDAP_P((Avlnode *, void*, AVL_CMP, void*, AVL_CMP, void*, int));
/* apply traversal types */