mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move delete of last value check out of inner loop.

Browse Source
This commit is contained in:
Kurt Zeilenga 2000-08-15 21:57:28 +00:00
parent f48f00f995
commit 20248e7430
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
servers/slapd/back-ldbm/modify.c
View File

@ -379,26 +379,17 @@ delete_values(
if( rc == LDAP_SUCCESS && match != 0 ) { if( rc == LDAP_SUCCESS && match != 0 ) {
continue; continue;
} }
/* found a matching value */
found = 1; found = 1;
/* found a matching value - delete it */ /* delete it */
ber_bvfree( a->a_vals[j] ); ber_bvfree( a->a_vals[j] );
for ( k = j + 1; a->a_vals[k] != NULL; k++ ) { for ( k = j + 1; a->a_vals[k] != NULL; k++ ) {
a->a_vals[k - 1] = a->a_vals[k]; a->a_vals[k - 1] = a->a_vals[k];
} }
a->a_vals[k - 1] = NULL; a->a_vals[k - 1] = NULL;
/* delete the entire attribute, if no values remain */
if ( a->a_vals[0] == NULL) {
Debug( LDAP_DEBUG_ARGS,
"removing entire attribute %s\n",
desc, 0, 0 );
if ( attr_delete( &e->e_attrs, mod->sm_desc ) ) {
ber_bvfree( asserted );
return LDAP_NO_SUCH_ATTRIBUTE;
}
}
break; break;
} }
@ -413,6 +404,16 @@ delete_values(
} }
} }
/* if no values remain, delete the entire attribute */
if ( a->a_vals[0] == NULL ) {
Debug( LDAP_DEBUG_ARGS,
"removing entire attribute %s\n",
desc, 0, 0 );
if ( attr_delete( &e->e_attrs, mod->sm_desc ) ) {
return LDAP_NO_SUCH_ATTRIBUTE;
}
}
return LDAP_SUCCESS; return LDAP_SUCCESS;
} }