ITS#2919 move OpenLDAPtime to OpenLDAPperson

[openldap] / servers / slapd / value.c

diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index bf8077c7c68bcec966285e3ce83c93eb772b0fbb..ebec9e348174b90c23b9ce1af187296a4c6e2fbd 100644 (file)
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40,105 +40,85 @@
 
 int
 value_add( 
-    BerVarray *vals,
-    BerVarray addvals
-)
+    BerVarray  *vals,
+    BerVarray  addvals )
 {
-       int     n, nn;
-       BerVarray v2;
+       int             n, nn = 0;
+       BerVarray       v2;
 
-       for ( nn = 0; addvals != NULL && addvals[nn].bv_val != NULL; nn++ )
-               ;       /* NULL */
+       if ( addvals != NULL ) {
+               for ( ; !BER_BVISNULL( &addvals[nn] ); nn++ )
+                       ;       /* NULL */
+       }
 
        if ( *vals == NULL ) {
                *vals = (BerVarray) SLAP_MALLOC( (nn + 1)
                    * sizeof(struct berval) );
                if( *vals == NULL ) {
-#ifdef NEW_LOGGING
-                        LDAP_LOG( OPERATION, ERR,
-                     "value_add: SLAP_MALLOC failed.\n", 0, 0, 0 );
-#else
                        Debug(LDAP_DEBUG_TRACE,
                      "value_add: SLAP_MALLOC failed.\n", 0, 0, 0 );
-#endif
                        return LBER_ERROR_MEMORY;
                }
                n = 0;
+
        } else {
-               for ( n = 0; (*vals)[n].bv_val != NULL; n++ ) {
+               for ( n = 0; !BER_BVISNULL( &(*vals)[n] ); n++ ) {
                        ;       /* Empty */
                }
                *vals = (BerVarray) SLAP_REALLOC( (char *) *vals,
                    (n + nn + 1) * sizeof(struct berval) );
                if( *vals == NULL ) {
-#ifdef NEW_LOGGING
-                        LDAP_LOG( OPERATION, ERR,
-                     "value_add: SLAP_MALLOC failed.\n", 0, 0, 0 );
-#else
                        Debug(LDAP_DEBUG_TRACE,
                      "value_add: SLAP_MALLOC failed.\n", 0, 0, 0 );
-#endif
                        return LBER_ERROR_MEMORY;
                }
        }
 
-       v2 = *vals + n;
-       for ( ; addvals->bv_val; v2++, addvals++ ) {
-               ber_dupbv(v2, addvals);
-               if (v2->bv_val == NULL) break;
+       v2 = &(*vals)[n];
+       for ( ; !BER_BVISNULL( addvals ); v2++, addvals++ ) {
+               ber_dupbv( v2, addvals );
+               if ( BER_BVISNULL( v2 ) ) break;
        }
-       v2->bv_val = NULL;
-       v2->bv_len = 0;
+       BER_BVZERO( v2 );
 
        return LDAP_SUCCESS;
 }
 
 int
 value_add_one( 
-    BerVarray *vals,
-    struct berval *addval
-)
+    BerVarray          *vals,
+    struct berval      *addval )
 {
-       int     n;
-       BerVarray v2;
+       int             n;
+       BerVarray       v2;
 
        if ( *vals == NULL ) {
                *vals = (BerVarray) SLAP_MALLOC( 2 * sizeof(struct berval) );
                if( *vals == NULL ) {
-#ifdef NEW_LOGGING
-                        LDAP_LOG( OPERATION, ERR,
-                     "value_add_one: SLAP_MALLOC failed.\n", 0, 0, 0 );
-#else
                        Debug(LDAP_DEBUG_TRACE,
                      "value_add_one: SLAP_MALLOC failed.\n", 0, 0, 0 );
-#endif
                        return LBER_ERROR_MEMORY;
                }
                n = 0;
+
        } else {
-               for ( n = 0; (*vals)[n].bv_val != NULL; n++ ) {
+               for ( n = 0; !BER_BVISNULL( &(*vals)[n] ); n++ ) {
                        ;       /* Empty */
                }
                *vals = (BerVarray) SLAP_REALLOC( (char *) *vals,
                    (n + 2) * sizeof(struct berval) );
                if( *vals == NULL ) {
-#ifdef NEW_LOGGING
-                        LDAP_LOG( OPERATION, ERR,
-                     "value_add_one: SLAP_MALLOC failed.\n", 0, 0, 0 );
-#else
                        Debug(LDAP_DEBUG_TRACE,
                      "value_add_one: SLAP_MALLOC failed.\n", 0, 0, 0 );
-#endif
                        return LBER_ERROR_MEMORY;
                }
        }
 
-       v2 = *vals + n;
+       v2 = &(*vals)[n];
        ber_dupbv(v2, addval);
 
        v2++;
-       v2->bv_val = NULL;
-       v2->bv_len = 0;
+       BER_BVZERO( v2 );
 
        return LDAP_SUCCESS;
 }
@@ -205,7 +185,6 @@ int asserted_value_validate_normalize(
        return LDAP_SUCCESS;
 }
 
-
 int
 value_match(
        int *match,
@@ -217,8 +196,6 @@ value_match(
        const char ** text )
 {
        int rc;
-       struct berval nv1 = { 0, NULL };
-       struct berval nv2 = { 0, NULL };
 
        assert( mr != NULL );
 
@@ -227,13 +204,8 @@ value_match(
        }
 
        rc = (mr->smr_match)( match, flags,
-               ad->ad_type->sat_syntax,
-               mr,
-               nv1.bv_val != NULL ? &nv1 : v1,
-               nv2.bv_val != NULL ? &nv2 : v2 );
+               ad->ad_type->sat_syntax, mr, v1, v2 );
        
-       if (nv1.bv_val ) free( nv1.bv_val );
-       if (nv2.bv_val ) free( nv2.bv_val );
        return rc;
 }
 
@@ -246,7 +218,7 @@ int value_find_ex(
 {
        int     i;
        int rc;
-       struct berval nval = { 0, NULL };
+       struct berval nval = BER_BVNULL;
        MatchingRule *mr = ad->ad_type->sat_equality;
 
        if( mr == NULL || !mr->smr_match ) {
@@ -276,11 +248,11 @@ int value_find_ex(
                        &vals[i], nval.bv_val == NULL ? val : &nval, &text );
 
                if( rc == LDAP_SUCCESS && match == 0 ) {
-                       sl_free( nval.bv_val, ctx );
+                       slap_sl_free( nval.bv_val, ctx );
                        return rc;
                }
        }
 
-       sl_free( nval.bv_val, ctx );
+       slap_sl_free( nval.bv_val, ctx );
        return LDAP_NO_SUCH_ATTRIBUTE;
 }