Attribute *a;
MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
char dummy = '\0';
- int match = 0;
+ int match = 0;
/*
* If permissive is set, then the non-existence of an
return LDAP_NO_SUCH_ATTRIBUTE;
}
- for ( i = 0; mod->sm_values[i].bv_val != NULL; i++ ) {
+ for ( i = 0; !BER_BVISNULL( &mod->sm_values[i] ); i++ ) {
int found = 0;
- for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
+ for ( j = 0; !BER_BVISNULL( &a->a_vals[j] ); j++ ) {
+ /* skip already deleted values */
+ if ( a->a_vals[j].bv_val == &dummy ) {
+ continue;
+ }
if( mod->sm_nvalues ) {
assert( a->a_nvals );
}
/* compact array skipping dummies */
- for ( k = 0, j = 0; a->a_vals[k].bv_val != NULL; k++ ) {
+ for ( k = 0, j = 0; !BER_BVISNULL( &a->a_vals[k] ); k++ ) {
/* skip dummies */
if( a->a_vals[k].bv_val == &dummy ) {
assert( a->a_nvals == NULL || a->a_nvals[k].bv_val == &dummy );
j++;
}
- a->a_vals[j].bv_val = NULL;
- if (a->a_nvals != a->a_vals) a->a_nvals[j].bv_val = NULL;
+ BER_BVZERO( &a->a_vals[j] );
+ if (a->a_nvals != a->a_vals) {
+ BER_BVZERO( &a->a_nvals[j] );
+ }
/* if no values remain, delete the entire attribute */
- if ( a->a_vals[0].bv_val == NULL ) {
+ if ( BER_BVISNULL( &a->a_vals[0] ) ) {
if ( attr_delete( &e->e_attrs, mod->sm_desc ) ) {
*text = textbuf;
snprintf( textbuf, textlen,
return LDAP_SUCCESS;
}
- for( i=0; a->a_nvals[i].bv_val != NULL; i++ ) {
+ for( i = 0; !BER_BVISNULL( &a->a_nvals[i] ); i++ ) {
char *tmp;
long value = atol( a->a_nvals[i].bv_val );
size_t strln = snprintf( str, sizeof(str), "%ld", value+incr );