Fix previous commit

[openldap] / servers / slapd / value.c

diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index 556b54fc79134c33abdf36c1ac2965d31f3c330f..c3c0b0d47257a1044244ad77e05cc5d6e448ed9e 100644 (file)
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -1,7 +1,7 @@
 /* value.c - routines for dealing with values */
 /* $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
  */
 
@@ -20,24 +20,25 @@
 
 int
 value_add( 
-    BVarray *vals,
-    BVarray addvals
+    BerVarray *vals,
+    BerVarray addvals
 )
 {
-       int     n, nn, i, j;
-       BVarray v2;
+       int     n, nn;
+       BerVarray v2;
 
        for ( nn = 0; addvals != NULL && addvals[nn].bv_val != NULL; nn++ )
                ;       /* NULL */
 
        if ( *vals == NULL ) {
-               *vals = (BVarray) ch_malloc( (nn + 1)
+               *vals = (BerVarray) ch_malloc( (nn + 1)
                    * sizeof(struct berval) );
                n = 0;
        } else {
-               for ( n = 0; (*vals)[n].bv_val != NULL; n++ )
-                       ;       /* NULL */
-               *vals = (BVarray) ch_realloc( (char *) *vals,
+               for ( n = 0; (*vals)[n].bv_val != NULL; n++ ) {
+                       ;       /* Empty */
+               }
+               *vals = (BerVarray) ch_realloc( (char *) *vals,
                    (n + nn + 1) * sizeof(struct berval) );
        }
 
@@ -176,7 +177,7 @@ value_match(
 int value_find_ex(
        AttributeDescription *ad,
        unsigned flags,
-       BVarray vals,
+       BerVarray vals,
        struct berval *val )
 {
        int     i;