mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
SLAP_NVALUES: remove all the extra frees
This commit is contained in:
parent
b1d245d9de
commit
8b6e1db2d3
@ -1885,10 +1885,10 @@ caseExactIgnoreSubstringsFilter
|
|||||||
}
|
}
|
||||||
|
|
||||||
if( nkeys == 0 ) {
|
if( nkeys == 0 ) {
|
||||||
|
#ifndef SLAP_NVALUES
|
||||||
if ( sa->sa_final.bv_val ) free( sa->sa_final.bv_val );
|
if ( sa->sa_final.bv_val ) free( sa->sa_final.bv_val );
|
||||||
if ( sa->sa_any ) ber_bvarray_free( sa->sa_any );
|
if ( sa->sa_any ) ber_bvarray_free( sa->sa_any );
|
||||||
if ( sa->sa_initial.bv_val ) free( sa->sa_initial.bv_val );
|
if ( sa->sa_initial.bv_val ) free( sa->sa_initial.bv_val );
|
||||||
#ifndef SLAP_NVALUES
|
|
||||||
ch_free( sa );
|
ch_free( sa );
|
||||||
#endif
|
#endif
|
||||||
*keysp = NULL;
|
*keysp = NULL;
|
||||||
@ -2002,10 +2002,11 @@ caseExactIgnoreSubstringsFilter
|
|||||||
ch_free( keys );
|
ch_free( keys );
|
||||||
*keysp = NULL;
|
*keysp = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef SLAP_NVALUES
|
||||||
if ( sa->sa_final.bv_val ) free( sa->sa_final.bv_val );
|
if ( sa->sa_final.bv_val ) free( sa->sa_final.bv_val );
|
||||||
if ( sa->sa_any ) ber_bvarray_free( sa->sa_any );
|
if ( sa->sa_any ) ber_bvarray_free( sa->sa_any );
|
||||||
if ( sa->sa_initial.bv_val ) free( sa->sa_initial.bv_val );
|
if ( sa->sa_initial.bv_val ) free( sa->sa_initial.bv_val );
|
||||||
#ifndef SLAP_NVALUES
|
|
||||||
ch_free( sa );
|
ch_free( sa );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@
|
|||||||
#include "ldap_queue.h"
|
#include "ldap_queue.h"
|
||||||
|
|
||||||
#ifdef LDAP_DEVEL
|
#ifdef LDAP_DEVEL
|
||||||
/* #define SLAP_NVALUES 1 */
|
#define SLAP_NVALUES 1
|
||||||
#define SLAP_EXTENDED_SCHEMA 1
|
#define SLAP_EXTENDED_SCHEMA 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user