/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/* attr.c - routines for dealing with attributes */
#include "slap.h"
#ifdef LDAP_DEBUG
-static void at_index_print( void );
+static void at_index_print( void ) {};
#endif
void
attr_free( Attribute *a )
{
- ad_free( a->a_desc, 1 );
- ber_bvecfree( a->a_vals );
+ bvarray_free( a->a_vals );
free( a );
}
if( a->a_vals != NULL ) {
int i;
- for( i=0; a->a_vals[i] != NULL; i++ ) {
+ for( i=0; a->a_vals[i].bv_val != NULL; i++ ) {
/* EMPTY */ ;
}
- tmp->a_vals = ch_malloc((i+1) * sizeof(struct berval*));
+ tmp->a_vals = ch_malloc((i+1) * sizeof(struct berval));
- for( i=0; a->a_vals[i] != NULL; i++ ) {
- tmp->a_vals[i] = ber_bvdup( a->a_vals[i] );
-
- if( tmp->a_vals[i] == NULL ) break;
+ for( i=0; a->a_vals[i].bv_val != NULL; i++ ) {
+ ber_dupbv( &tmp->a_vals[i], &a->a_vals[i] );
+ if( tmp->a_vals[i].bv_val == NULL ) break;
}
- tmp->a_vals[i] = NULL;
+ tmp->a_vals[i].bv_val = NULL;
} else {
tmp->a_vals = NULL;
}
- tmp->a_desc = ad_dup( a->a_desc );
+ tmp->a_desc = a->a_desc;
tmp->a_next = NULL;
return tmp;
int
attr_merge(
- Entry *e,
+ Entry *e,
AttributeDescription *desc,
- struct berval **vals )
+ BVarray vals )
{
Attribute **a;
if ( *a == NULL ) {
*a = (Attribute *) ch_malloc( sizeof(Attribute) );
- (*a)->a_desc = ad_dup( desc );
+ (*a)->a_desc = desc;
(*a)->a_vals = NULL;
(*a)->a_next = NULL;
}