X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Favl.h;h=458f99fd483bcf5798a0c4019bb4504e9a9b54c5;hb=2ba90833c762a73af7c77392f9bbdf5c2bba881e;hp=19ed4408ade5a10a5c8f36446d44f8c36f8c7b7f;hpb=12a81157a10d4a2a68ef2f00db6bf21f8e7ee10f;p=openldap
diff --git a/include/avl.h b/include/avl.h
index 19ed4408ad..458f99fd48 100644
--- a/include/avl.h
+++ b/include/avl.h
@@ -1,6 +1,19 @@
/* avl.h - avl tree definitions */
-/*
- * Copyright (c) 1993 Regents of the University of Michigan.
+/* $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, 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.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
@@ -23,17 +36,21 @@
LDAP_BEGIN_DECL
-typedef struct avlnode {
- caddr_t avl_data;
- signed char avl_bf;
+typedef struct avlnode Avlnode;
+
+struct avlnode {
+ void* avl_data;
+ signed int avl_bf;
struct avlnode *avl_left;
struct avlnode *avl_right;
-} Avlnode;
+};
+
+#ifdef AVL_INTERNAL
#define NULLAVL ((Avlnode *) NULL)
/* balance factor values */
-#define LH -1
+#define LH (-1)
#define EH 0
#define RH 1
@@ -41,45 +58,57 @@ 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((const void*, const void*));
+typedef int (*AVL_DUP) LDAP_P((void*, void*));
+typedef void (*AVL_FREE) LDAP_P((void*));
+
+LDAP_AVL_F( int )
+avl_free LDAP_P(( Avlnode *root, AVL_FREE dfree ));
-LDAP_F int
-avl_free LDAP_P(( Avlnode *root, IFP dfree ));
+LDAP_AVL_F( int )
+avl_insert LDAP_P((Avlnode **, void*, AVL_CMP, AVL_DUP));
-LDAP_F int
-avl_insert LDAP_P((Avlnode **, caddr_t, IFP, IFP));
+LDAP_AVL_F( void* )
+avl_delete LDAP_P((Avlnode **, void*, AVL_CMP));
-LDAP_F caddr_t
-avl_delete LDAP_P((Avlnode **, caddr_t, IFP));
+LDAP_AVL_F( void* )
+avl_find LDAP_P((Avlnode *, const void*, AVL_CMP));
-LDAP_F caddr_t
-avl_find LDAP_P((Avlnode *, caddr_t, IFP));
+LDAP_AVL_F( Avlnode* )
+avl_find2 LDAP_P((Avlnode *, const void*, AVL_CMP));
-LDAP_F caddr_t
+LDAP_AVL_F( void* )
+avl_find_lin LDAP_P((Avlnode *, const void*, AVL_CMP));
+
+#ifdef AVL_NONREENTRANT
+LDAP_AVL_F( void* )
avl_getfirst LDAP_P((Avlnode *));
-#ifdef AVL_REENTRANT
-LDAP_F caddr_t
-avl_getnext LDAP_P((Avlnode *, caddr_t ));
-#else
-LDAP_F caddr_t
+LDAP_AVL_F( void* )
avl_getnext LDAP_P((void));
#endif
-LDAP_F int
-avl_dup_error LDAP_P((void));
+LDAP_AVL_F( int )
+avl_dup_error LDAP_P((void*, void*));
+
+LDAP_AVL_F( int )
+avl_dup_ok LDAP_P((void*, void*));
+
+LDAP_AVL_F( int )
+avl_apply LDAP_P((Avlnode *, AVL_APPLY, void*, int, int));
-LDAP_F int
-avl_apply LDAP_P((Avlnode *, IFP, caddr_t, int, int));
+LDAP_AVL_F( int )
+avl_prefixapply LDAP_P((Avlnode *, void*, AVL_CMP, void*, AVL_CMP, void*, int));
/* apply traversal types */
#define AVL_PREORDER 1
#define AVL_INORDER 2
#define AVL_POSTORDER 3
/* what apply returns if it ran out of nodes */
-#define AVL_NOMORE -6
+#define AVL_NOMORE (-6)
LDAP_END_DECL