Fix up SASL interact error checking

[openldap] / libraries / libavl / avl.c

diff --git a/libraries/libavl/avl.c b/libraries/libavl/avl.c
index c1b1aad6cb5146967e6a984ab85ff3e83e0b5063..63a543f8e4fb82f048d2387a887031dfa8119c18 100644 (file)
--- a/libraries/libavl/avl.c
+++ b/libraries/libavl/avl.c
@@ -1,4 +1,9 @@
 /* avl.c - routines to implement an avl tree */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1993 Regents of the University of Michigan.
  * All rights reserved.
@@ -19,14 +24,15 @@ static char avl_version[] = "AVL library version 1.0\n";
 #endif
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
+#define AVL_INTERNAL
 #include "avl.h"
 
 #define ROTATERIGHT(x) { \
        Avlnode *tmp;\
        if ( *(x) == NULL || (*(x))->avl_left == NULL ) {\
-               (void) fputs("RR error\n", stderr); exit(1); \
+               (void) fputs("RR error\n", stderr); exit( EXIT_FAILURE ); \
        }\
        tmp = (*(x))->avl_left;\
        (*(x))->avl_left = tmp->avl_right;\
@@ -36,7 +42,7 @@ static char avl_version[] = "AVL library version 1.0\n";
 #define ROTATELEFT(x)  { \
        Avlnode *tmp;\
        if ( *(x) == NULL || (*(x))->avl_right == NULL ) {\
-               (void) fputs("RL error\n", stderr); exit(1); \
+               (void) fputs("RL error\n", stderr); exit( EXIT_FAILURE ); \
        }\
        tmp = (*(x))->avl_right;\
        (*(x))->avl_right = tmp->avl_left;\
@@ -621,7 +627,7 @@ avl_free( Avlnode *root, AVL_FREE dfree )
  */
 
 void*
-avl_find( Avlnode *root, void* data, AVL_CMP fcmp )
+avl_find( Avlnode *root, const void* data, AVL_CMP fcmp )
 {
        int     cmp;
 
@@ -643,7 +649,7 @@ avl_find( Avlnode *root, void* data, AVL_CMP fcmp )
  */
 
 void*
-avl_find_lin( Avlnode *root, void* data, AVL_CMP fcmp )
+avl_find_lin( Avlnode *root, const void* data, AVL_CMP fcmp )
 {
        void*   res;
 
@@ -664,6 +670,8 @@ avl_find_lin( Avlnode *root, void* data, AVL_CMP fcmp )
                return( avl_find_lin( root->avl_right, data, fcmp ) );
 }
 
+/* NON-REENTRANT INTERFACE */
+
 static void*   *avl_list;
 static int     avl_maxlist;
 static int     avl_nextlist;
@@ -736,6 +744,9 @@ avl_getnext( void )
        return( avl_list[ avl_nextlist++ ] );
 }
 
+/* end non-reentrant code */
+
+
 int
 avl_dup_error( void* left, void* right )
 {