Changed struct berval ** to BVarray

[openldap] / servers / slapd / attr.c

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index 9239e161f812e6c378608858e8c8f7ec2edcb634..19358e8948af6f6816e4845712f34b9158e651e9 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -23,14 +23,13 @@
 #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 );
 }
 
@@ -56,25 +55,24 @@ Attribute *attr_dup( Attribute *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;
@@ -111,7 +109,7 @@ int
 attr_merge(
        Entry           *e,
        AttributeDescription *desc,
-       struct berval   **vals )
+       BVarray vals )
 {
        Attribute       **a;
 
@@ -124,7 +122,7 @@ attr_merge(
 
        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;
        }