/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
void
-attr_clean_x( Attribute *a, void *ctx )
+attr_clean( Attribute *a )
{
if ( a->a_nvals && a->a_nvals != a->a_vals &&
!( a->a_flags & SLAP_ATTR_DONT_FREE_VALS )) {
if ( a->a_flags & SLAP_ATTR_DONT_FREE_DATA ) {
- ber_memfree_x( a->a_nvals, ctx );
+ free( a->a_nvals );
} else {
- ber_bvarray_free_x( a->a_nvals, ctx );
+ ber_bvarray_free( a->a_nvals );
}
}
/* a_vals may be equal to slap_dummy_bv, a static empty berval;
if ( a->a_vals != &slap_dummy_bv &&
!( a->a_flags & SLAP_ATTR_DONT_FREE_VALS )) {
if ( a->a_flags & SLAP_ATTR_DONT_FREE_DATA ) {
- ber_memfree_x( a->a_vals, ctx );
+ free( a->a_vals );
} else {
- ber_bvarray_free_x( a->a_vals, ctx );
+ ber_bvarray_free( a->a_vals );
}
}
a->a_desc = NULL;
a->a_numvals = 0;
}
-void
-attr_clean( Attribute *a )
-{
- attr_clean_x( a, NULL );
-}
-
void
attr_free( Attribute *a )
{
#endif
void
-attrs_free_x( Attribute *a, void *ctx )
+attrs_free( Attribute *a )
{
if ( a ) {
Attribute *b = (Attribute *)0xBAD, *tail, *next;
tail = a;
do {
next = a->a_next;
- attr_clean_x( a, ctx );
+ attr_clean( a );
a->a_next = b;
b = a;
a = next;
}
}
-void
-attrs_free( Attribute *a )
-{
- attrs_free_x( a, NULL );
-}
-
static void
attr_dup2( Attribute *tmp, Attribute *a )
{
tmp->a_flags = a->a_flags & SLAP_ATTR_PERSISTENT_FLAGS;
if ( a->a_vals != NULL ) {
- int i;
+ unsigned i, j;
tmp->a_numvals = a->a_numvals;
tmp->a_vals = ch_malloc( (tmp->a_numvals + 1) * sizeof(struct berval) );
assert( a->a_nvals != NULL );
if ( a->a_nvals != a->a_vals ) {
- int j;
tmp->a_nvals = ch_malloc( (tmp->a_numvals + 1) * sizeof(struct berval) );
for ( j = 0; !BER_BVISNULL( &a->a_nvals[j] ); j++ ) {
while ( 0 < n ) {
unsigned pivot = n >> 1;
i = base + pivot;
- if ( i >= a->a_numvals ) {
- i = a->a_numvals - 1;
- break;
- }
rc = value_match( &match, a->a_desc, mr, flags,
&a->a_nvals[i], cval, &text );
if ( rc == LDAP_SUCCESS && match == 0 )
break;
- n = pivot;
- if ( match < 0 )
+ if ( match < 0 ) {
base = i+1;
+ n -= pivot+1;
+ } else {
+ n = pivot;
+ }
}
if ( match < 0 )
i++;
rc = LDAP_TYPE_OR_VALUE_EXISTS;
return rc;
}
- for ( j = a->a_numvals; j >= slot; j-- ) {
+ for ( j = a->a_numvals; j >= (int)slot; j-- ) {
a->a_vals[j+1] = a->a_vals[j];
if ( nvals )
a->a_nvals[j+1] = a->a_nvals[j];