Changed struct berval ** to BVarray

[openldap] / servers / slapd / attr.c

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index dd36a7ea0f52d1ea98ab9e06a23f05d081fe13b3..19358e8948af6f6816e4845712f34b9158e651e9 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -23,18 +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 )
 {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-       ad_free( a->a_desc, 1 );
-#else
-       free( a->a_type );
-#endif
-       ber_bvecfree( a->a_vals );
+       bvarray_free( a->a_vals );
        free( a );
 }
 
@@ -60,30 +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*));
-
-               for( i=0; a->a_vals[i] != NULL; i++ ) {
-                       tmp->a_vals[i] = ber_bvdup( a->a_vals[i] );
+               tmp->a_vals = ch_malloc((i+1) * sizeof(struct berval));
 
-                       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;
        }
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-       tmp->a_desc = ad_dup( a->a_desc );
-#else
-       tmp->a_type = ch_strdup( a->a_type );
-       tmp->a_syntax = a->a_syntax;
-#endif
+       tmp->a_desc = a->a_desc;
        tmp->a_next = NULL;
 
        return tmp;
@@ -107,66 +96,7 @@ Attribute *attrs_dup( Attribute *a )
        return tmp;
 }
 
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
-/*
- * attr_normalize - normalize an attribute name (make it all lowercase)
- */
 
-char *
-attr_normalize( char *s )
-{
-       assert( s != NULL );
-
-       return( ldap_pvt_str2lower( s ) );
-}
-#endif
-
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
-/*
- * attr_merge_fast - merge the given type and value with the list of
- * attributes in attrs. called from str2entry(), where we can make some
- * assumptions to make things faster.
- * returns     0       everything went ok
- *             -1      trouble
- */
-
-int
-attr_merge_fast(
-    Entry              *e,
-    const char         *type,
-    struct berval      **vals,
-    int                        nvals,
-    int                        naddvals,
-    int                        *maxvals,
-    Attribute          ***a
-)
-{
-       if ( *a == NULL ) {
-               for ( *a = &e->e_attrs; **a != NULL; *a = &(**a)->a_next ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-                       /* not yet implemented */
-#else
-                       if ( strcasecmp( (**a)->a_type, type ) == 0 ) {
-                               break;
-                       }
-#endif
-               }
-       }
-
-       if ( **a == NULL ) {
-               **a = (Attribute *) ch_malloc( sizeof(Attribute) );
-               (**a)->a_vals = NULL;
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
-               (**a)->a_type = attr_normalize( ch_strdup( type ) );
-               (**a)->a_syntax = attr_syntax( type );
-#endif
-               (**a)->a_next = NULL;
-       }
-
-       return( value_add_fast( &(**a)->a_vals, vals, nvals, naddvals,
-           maxvals ) );
-}
-#endif
 
 /*
  * attr_merge - merge the given type and value with the list of
@@ -177,30 +107,22 @@ attr_merge_fast(
 
 int
 attr_merge(
-    Entry              *e,
-    const char         *type,
-    struct berval      **vals )
+       Entry           *e,
+       AttributeDescription *desc,
+       BVarray vals )
 {
        Attribute       **a;
 
        for ( a = &e->e_attrs; *a != NULL; a = &(*a)->a_next ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-               /* not yet implemented */
-#else
-               if ( strcasecmp( (*a)->a_type, type ) == 0 ) {
+               if ( ad_cmp( (*a)->a_desc, desc ) == 0 )
+               {
                        break;
                }
-#endif
        }
 
        if ( *a == NULL ) {
                *a = (Attribute *) ch_malloc( sizeof(Attribute) );
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-               /* not yet implemented */
-#else
-               (*a)->a_type = attr_normalize( ch_strdup( type ) );
-               (*a)->a_syntax = attr_syntax( type );
-#endif
+               (*a)->a_desc = desc;
                (*a)->a_vals = NULL;
                (*a)->a_next = NULL;
        }
@@ -208,7 +130,6 @@ attr_merge(
        return( value_add( &(*a)->a_vals, vals ) );
 }
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 /*
  * attrs_find - find attribute(s) by AttributeDescription
  * returns next attribute which is subtype of provided description.
@@ -221,14 +142,13 @@ attrs_find(
 )
 {
        for ( ; a != NULL; a = a->a_next ) {
-               if ( is_ad_subtype( a->a_desc, desc ) == 0 ) {
+               if ( is_ad_subtype( a->a_desc, desc ) ) {
                        return( a );
                }
        }
 
        return( NULL );
 }
-#endif
 
 /*
  * attr_find - find attribute by type
@@ -237,19 +157,11 @@ attrs_find(
 Attribute *
 attr_find(
     Attribute  *a,
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
        AttributeDescription *desc
-#else
-       const char      *type
-#endif
 )
 {
        for ( ; a != NULL; a = a->a_next ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
                if ( ad_cmp( a->a_desc, desc ) == 0 )
-#else
-               if ( strcasecmp( a->a_type, type ) == 0 )
-#endif
                {
                        return( a );
                }
@@ -268,34 +180,22 @@ attr_find(
 int
 attr_delete(
     Attribute  **attrs,
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
        AttributeDescription *desc
-#else
-    const char *type
-#endif
 )
 {
        Attribute       **a;
-       Attribute       *save;
 
        for ( a = attrs; *a != NULL; a = &(*a)->a_next ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-               /* not yet implemented */
-#else
-               if ( strcasecmp( (*a)->a_type, type ) == 0 ) {
-                       break;
-               }
-#endif
-       }
+               if ( ad_cmp( (*a)->a_desc, desc ) == 0 )
+               {
+                       Attribute       *save = *a;
+                       *a = (*a)->a_next;
+                       attr_free( save );
 
-       if ( *a == NULL ) {
-               return( 1 );
+                       return LDAP_SUCCESS;
+               }
        }
 
-       save = *a;
-       *a = (*a)->a_next;
-       attr_free( save );
-
-       return( 0 );
+       return LDAP_NO_SUCH_ATTRIBUTE;
 }