X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Favl.h;h=f23ec135c1a55dc29bbde5145c5dfdc3497bad09;hb=19838fe2ef8161be435454490284baf98d73df88;hp=757931c9b59567740451b373a72ea6a97099faa5;hpb=dc07e765f263ef459dcd2afd1ece01cfc85a0edd;p=openldap
diff --git a/include/avl.h b/include/avl.h
index 757931c9b5..f23ec135c1 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-2006 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
@@ -32,12 +36,21 @@
LDAP_BEGIN_DECL
-typedef struct avlnode {
+typedef struct avlnode Avlnode;
+
+struct avlnode {
void* avl_data;
+ struct avlnode *avl_link[2];
+ char avl_bits[2];
signed char avl_bf;
- struct avlnode *avl_left;
- struct avlnode *avl_right;
-} Avlnode;
+};
+
+#define avl_left avl_link[0]
+#define avl_right avl_link[1]
+#define avl_lbit avl_bits[0]
+#define avl_rbit avl_bits[1]
+
+#ifdef AVL_INTERNAL
#define NULLAVL ((Avlnode *) NULL)
@@ -46,54 +59,88 @@ typedef struct avlnode {
#define EH 0
#define RH 1
+/* thread bits */
+#define AVL_THREAD 0
+#define AVL_CHILD 1
+
/* 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 */
+
+#define avl_child(x,dir) ((x)->avl_bits[dir]) == AVL_CHILD ? \
+ (x)->avl_link[dir] : NULL
+#define avl_lchild(x) avl_child(x,0)
+#define avl_rchild(x) avl_child(x,1)
+
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));
+LDAP_AVL_F( int )
+tavl_free LDAP_P(( Avlnode *root, AVL_FREE dfree ));
+
+LDAP_AVL_F( int )
+tavl_insert LDAP_P((Avlnode **, void*, AVL_CMP, AVL_DUP));
+
+LDAP_AVL_F( void* )
+tavl_delete LDAP_P((Avlnode **, void*, AVL_CMP));
+
+LDAP_AVL_F( void* )
+tavl_find LDAP_P((Avlnode *, const void*, AVL_CMP));
+
+LDAP_AVL_F( Avlnode* )
+tavl_find2 LDAP_P((Avlnode *, const void*, AVL_CMP));
+
+#define TAVL_DIR_LEFT 0
+#define TAVL_DIR_RIGHT 1
+
+LDAP_AVL_F( Avlnode* )
+tavl_end LDAP_P((Avlnode *, int direction ));
+
+LDAP_AVL_F( Avlnode* )
+tavl_next LDAP_P((Avlnode *, int direction ));
+
/* apply traversal types */
#define AVL_PREORDER 1
#define AVL_INORDER 2