X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Favl.h;h=458f99fd483bcf5798a0c4019bb4504e9a9b54c5;hb=2ba90833c762a73af7c77392f9bbdf5c2bba881e;hp=aa9f58f66f23e3952791411640a83afb06746b81;hpb=f704f1c475636cbcea7ff83164aeac06a6e1fca8;p=openldap
diff --git a/include/avl.h b/include/avl.h
index aa9f58f66f..458f99fd48 100644
--- a/include/avl.h
+++ b/include/avl.h
@@ -1,14 +1,19 @@
-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* avl.h - avl tree definitions */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2005 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
+ * .
*/
-/* 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
@@ -18,7 +23,6 @@
* software without specific prior written permission. This software
* is provided ``as is'' without express or implied warranty.
*/
-/* avl.h - avl tree definitions */
#ifndef _AVL
@@ -34,64 +38,69 @@ LDAP_BEGIN_DECL
typedef struct avlnode Avlnode;
-#ifdef AVL_INTERNAL
struct avlnode {
void* avl_data;
- signed char avl_bf;
+ signed int avl_bf;
struct avlnode *avl_left;
struct avlnode *avl_right;
};
+#ifdef AVL_INTERNAL
+
#define NULLAVL ((Avlnode *) NULL)
/* balance factor values */
#define LH (-1)
#define EH 0
#define RH 1
-#endif
/* avl routines */
#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));
#ifdef AVL_NONREENTRANT
-LDAP_F( void* )
+LDAP_AVL_F( void* )
avl_getfirst LDAP_P((Avlnode *));
-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 */