mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-15 03:01:09 +08:00
1bcec8bf6a
library use: LBER_ macros expand to system routines. LDAP_ macros expand to new ber_ allocators. Add ber_ and ldap_ memory allocators/deallocator: ber_ routines are wrappers of LBER_ macros. ldap_ routines are wrappers of ber_ routines. Removed safe_realloc() macro from various files. This issue (if an issue) should be resolved across whole package. ldapmodify.c now uses ber_ allocators to resolve ber_bvfree() vs. WIN32 multiple heaps issue. These changes should facilate implementation of ber_set_option( NULL, LBER_OPT_MEMORY_FN, ...) and ldap_set_option( NULL, LDAP_OPT_MEMORY_FN, ...).
113 lines
2.2 KiB
C
113 lines
2.2 KiB
C
/*
|
|
* Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
|
|
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
|
|
*/
|
|
/* Portions
|
|
* Copyright (c) 1994 The Regents of the University of Michigan.
|
|
* All rights reserved.
|
|
*
|
|
* free.c - some free routines are included here to avoid having to
|
|
* link in lots of extra code when not using certain features
|
|
*/
|
|
|
|
#include "portable.h"
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
#include <ac/ctype.h>
|
|
#include <ac/string.h>
|
|
#include <ac/time.h>
|
|
|
|
#include "ldap-int.h"
|
|
|
|
/*
|
|
* C-API deallocator
|
|
*/
|
|
void
|
|
ldap_memfree( void *p )
|
|
{
|
|
LDAP_FREE( p );
|
|
}
|
|
|
|
void *
|
|
ldap_memalloc( size_t s )
|
|
{
|
|
return LDAP_MALLOC( s );
|
|
}
|
|
|
|
void *
|
|
ldap_memcalloc( size_t n, size_t s )
|
|
{
|
|
return LDAP_CALLOC( n, s );
|
|
}
|
|
|
|
void *
|
|
ldap_memrealloc( void* p, size_t s )
|
|
{
|
|
return LDAP_REALLOC( p, s );
|
|
}
|
|
|
|
void
|
|
ldap_getfilter_free( LDAPFiltDesc *lfdp )
|
|
{
|
|
LDAPFiltList *flp, *nextflp;
|
|
LDAPFiltInfo *fip, *nextfip;
|
|
|
|
for ( flp = lfdp->lfd_filtlist; flp != NULL; flp = nextflp ) {
|
|
for ( fip = flp->lfl_ilist; fip != NULL; fip = nextfip ) {
|
|
nextfip = fip->lfi_next;
|
|
LDAP_FREE( fip->lfi_filter );
|
|
LDAP_FREE( fip->lfi_desc );
|
|
LDAP_FREE( fip );
|
|
}
|
|
nextflp = flp->lfl_next;
|
|
LDAP_FREE( flp->lfl_pattern );
|
|
LDAP_FREE( flp->lfl_delims );
|
|
LDAP_FREE( flp->lfl_tag );
|
|
LDAP_FREE( flp );
|
|
}
|
|
|
|
if ( lfdp->lfd_curvalcopy != NULL ) {
|
|
LDAP_FREE( lfdp->lfd_curvalcopy );
|
|
}
|
|
if ( lfdp->lfd_curvalwords != NULL ) {
|
|
LDAP_FREE( lfdp->lfd_curvalwords );
|
|
}
|
|
if ( lfdp->lfd_filtprefix != NULL ) {
|
|
LDAP_FREE( lfdp->lfd_filtprefix );
|
|
}
|
|
if ( lfdp->lfd_filtsuffix != NULL ) {
|
|
LDAP_FREE( lfdp->lfd_filtsuffix );
|
|
}
|
|
|
|
LDAP_FREE( lfdp );
|
|
}
|
|
|
|
/*
|
|
* free a null-terminated array of pointers to mod structures. the
|
|
* structures are freed, not the array itself, unless the freemods
|
|
* flag is set.
|
|
*/
|
|
|
|
void
|
|
ldap_mods_free( LDAPMod **mods, int freemods )
|
|
{
|
|
int i;
|
|
|
|
if ( mods == NULL )
|
|
return;
|
|
|
|
for ( i = 0; mods[i] != NULL; i++ ) {
|
|
if ( mods[i]->mod_op & LDAP_MOD_BVALUES ) {
|
|
ber_bvecfree( mods[i]->mod_bvalues );
|
|
} else {
|
|
ldap_value_free( mods[i]->mod_values );
|
|
}
|
|
LDAP_FREE( (char *) mods[i] );
|
|
}
|
|
|
|
if ( freemods )
|
|
LDAP_FREE( (char *) mods );
|
|
}
|