Revert previous commit

[openldap] / servers / slapd / charray.c

diff --git a/servers/slapd/charray.c b/servers/slapd/charray.c
index 4c61238b3a57572266102aad2b5914442b913f3b..46bff0714af508f3ff9819c9bafd00528180d9b8 100644 (file)
--- a/servers/slapd/charray.c
+++ b/servers/slapd/charray.c
@@ -1,7 +1,7 @@
 /* charray.c - routines for dealing with char * arrays */
 /* $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
  */
 
@@ -188,7 +188,7 @@ charray_strcmp( const char **a1, const char **a2 )
                }
        }
 
-       if ( ! ( a1[0] && a2[0] ) ) {
+       if ( a1[0] || a2[0] ) {
                return( !0 );
        }
 
@@ -205,65 +205,9 @@ charray_strcasecmp( const char **a1, const char **a2 )
                }
        }
 
-       if ( ! ( a1[0] && a2[0] ) ) {
+       if ( a1[0] || a2[0] ) {
                return( !0 );
        }
 
        return 0;
 }
-
-/* strcopy is like strcpy except it returns a pointer to the trailing NUL of
- * the result string. This allows fast construction of catenated strings
- * without the overhead of strlen/strcat.
- */
-char *
-slap_strcopy(
-       char *a,
-       const char *b
-)
-{
-       if (!a || !b)
-               return a;
-       
-       while (*a++ = *b++) ;
-       return a-1;
-}
-
-void
-bvarray_add(
-    struct berval **a,
-    struct berval *bv
-)
-{
-       int     n;
-
-       if ( *a == NULL ) {
-               *a = (struct berval *) ch_malloc( 2 * sizeof(struct berval) );
-               n = 0;
-       } else {
-               for ( n = 0; *a != NULL && (*a)[n].bv_val != NULL; n++ ) {
-                       ;       /* NULL */
-               }
-
-               *a = (struct berval *) ch_realloc( (char *) *a,
-                   (n + 2) * sizeof(struct berval) );
-       }
-
-       ber_dupbv( (*a)+n, bv );
-       n++;
-       (*a)[n].bv_val = NULL;
-}
-
-void
-bvarray_free(
-    struct berval *a
-)
-{
-       int i;
-
-       if (a) {
-               for (i=0; a[i].bv_val; i++)
-                       free(a[i].bv_val);
-               free(a);
-       }
-}