+/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/* Portions
#include "portable.h"
#include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
-#include <ac/ctype.h>
#include <ac/string.h>
#include <ac/time.h>
LDAP_FREE( p );
}
+void
+ldap_memvfree( void **v )
+{
+ LDAP_VFREE( v );
+}
+
void *
-ldap_memalloc( size_t s )
+ldap_memalloc( ber_len_t s )
{
return LDAP_MALLOC( s );
}
void *
-ldap_memcalloc( size_t n, size_t s )
+ldap_memcalloc( ber_len_t n, ber_len_t s )
{
return LDAP_CALLOC( n, s );
}
void *
-ldap_memrealloc( void* p, size_t s )
+ldap_memrealloc( void* p, ber_len_t s )
{
return LDAP_REALLOC( p, s );
}
+char *
+ldap_strdup( LDAP_CONST char *p )
+{
+ return LDAP_STRDUP( p );
+}
+
void
ldap_getfilter_free( LDAPFiltDesc *lfdp )
{
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 );
+ if( mods[i]->mod_bvalues != NULL )
+ ber_bvecfree( mods[i]->mod_bvalues );
+
+ } else if( mods[i]->mod_values != NULL ) {
+ LDAP_VFREE( mods[i]->mod_values );
+ }
+
+ if ( mods[i]->mod_type != NULL ) {
+ LDAP_FREE( mods[i]->mod_type );
}
+
LDAP_FREE( (char *) mods[i] );
}
- if ( freemods )
+ if ( freemods ) {
LDAP_FREE( (char *) mods );
+ }
}