upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-02 21:19:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

No-op change for ITS#6715: help compiler a bit in attr_valfind()

Browse source
This commit is contained in:
Hallvard Furuseth 2010-11-22 12:09:43 +00:00
parent d3cddce244
commit 2a9cbcc5b5
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
servers/slapd/attr.c
View file

@ -293,7 +293,7 @@ attr_valfind(
MatchingRule *mr;
const char *text;
int match = -1, rc;
unsigned i;
unsigned i, n;
if ( flags & SLAP_MR_ORDERING )
mr = a->a_desc->ad_type->sat_ordering;
@ -316,9 +316,10 @@ attr_valfind(
cval = val;
}
n = a->a_numvals;
if ( a->a_flags & SLAP_ATTR_SORTED_VALS ) {
/* Binary search */
unsigned base = 0, n = a->a_numvals;
unsigned base = 0;
while ( 0 < n ) {
unsigned pivot = n >> 1;
@ -338,7 +339,7 @@ attr_valfind(
i++;
} else {
/* Linear search */
for ( i = 0; i < a->a_numvals; i++ ) {
for ( i = 0; i < n; i++ ) {
const char *text;
rc = ordered_value_match( &match, a->a_desc, mr, flags,
@ -347,10 +348,10 @@ attr_valfind(
break;
}
}
if ( slot )
*slot = i;
if ( match )
rc = LDAP_NO_SUCH_ATTRIBUTE;
if ( slot )
*slot = i;
if ( nval.bv_val )
slap_sl_free( nval.bv_val, ctx );