upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-27 10:09:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change avl.c to use ber_memalloc and ber_memrealloc.

Browse source 
Add -llber to Makefile so testavl will build.
This commit is contained in:
Howard Chu 2001-09-27 01:08:22 +00:00
parent ef7b93242d
commit 2a853f0ca5
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/libavl/Makefile.in
View file

@ -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)

11
libraries/libavl/avl.c
View file

@ -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*));
}