Change avl.c to use ber_memalloc and ber_memrealloc.

Add -llber to Makefile so testavl will build.

diff --git a/libraries/libavl/Makefile.in b/libraries/libavl/Makefile.in
index 0ccaefee7cff9e9a0ccf99c7704f86422d2f5c71..1d3c61e347f9a50279ba06e60e7c288012560836 100644 (file)
--- a/libraries/libavl/Makefile.in
+++ b/libraries/libavl/Makefile.in
@@ -14,7 +14,7 @@ LDAP_LIBDIR= ../../libraries
 
 LIBRARY = libavl.a
 PROGRAMS       = testavl
-XLIBS = -lavl
+XLIBS = -lavl -llber
 
 testavl:       $(LIBRARY) testavl.o
        $(LTLINK) -o $@ testavl.o $(LIBS)

diff --git a/libraries/libavl/avl.c b/libraries/libavl/avl.c
index ea780a9eff3eeab8db778683d8dd5da696a9f784..827e7d3404d9fdfa3d0f45ada4283f0a9df586da 100644 (file)
--- a/libraries/libavl/avl.c
+++ b/libraries/libavl/avl.c
@@ -21,6 +21,11 @@
 #include <stdio.h>
 #include <ac/stdlib.h>
 
+#ifdef CSRIMALLOC
+#define ber_memalloc malloc
+#define ber_memrealloc realloc
+#endif
+
 #define AVL_INTERNAL
 #include "avl.h"
 
@@ -64,7 +69,7 @@ ravl_insert(
        Avlnode *l, *r;
 
        if ( *iroot == 0 ) {
-               if ( (*iroot = (Avlnode *) malloc( sizeof( Avlnode ) ))
+               if ( (*iroot = (Avlnode *) ber_memalloc( sizeof( Avlnode ) ))
                    == NULL ) {
                        return( -1 );
                }
@@ -680,12 +685,12 @@ avl_buildlist( void* data, void* arg )
        static int      slots;
 
        if ( avl_list == (void* *) 0 ) {
-               avl_list = (void* *) malloc(AVL_GRABSIZE * sizeof(void*));
+               avl_list = (void* *) ber_memalloc(AVL_GRABSIZE * sizeof(void*));
                slots = AVL_GRABSIZE;
                avl_maxlist = 0;
        } else if ( avl_maxlist == slots ) {
                slots += AVL_GRABSIZE;
-               avl_list = (void* *) realloc( (char *) avl_list,
+               avl_list = (void* *) ber_memrealloc( (char *) avl_list,
                    (unsigned) slots * sizeof(void*));
        }