}
}
- if ( ! ( a1[0] && a2[0] ) ) {
+ if ( a1[0] || a2[0] ) {
return( !0 );
}
}
}
- if ( ! ( a1[0] && a2[0] ) ) {
+ if ( a1[0] || a2[0] ) {
return( !0 );
}
if (!a || !b)
return a;
- while (*a++ = *b++) ;
+ while ((*a++ = *b++)) ;
return a-1;
}
while ((*a++ = *b++) && n-- > 0) ;
return a-1;
}
-
-/* Unlike charray_add, bvarray_add does not make a new copy of the
- * source string. Typically it is used where ber_bvecadd was before,
- * and ber_bvecadd didn't duplicate its source either.
- */
-int
-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) );
- }
- if ( *a == NULL ) return -1;
-
- (*a)[n++] = *bv;
- (*a)[n].bv_val = NULL;
-
- return 0;
-}
-
-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);
- }
-}