ITS#2919 move OpenLDAPtime to OpenLDAPperson

[openldap] / servers / slapd / value.c

diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index 5295cd8330545377b159428ca02a98b88eac5e1a..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,103 +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;
 }
@@ -203,7 +185,6 @@ int asserted_value_validate_normalize(
        return LDAP_SUCCESS;
 }
 
-
 int
 value_match(
        int *match,