static int
ainfo_type_cmp(
- AttributeDescription *desc,
- AttrInfo *a
+ const void *v_desc,
+ const void *v_a
)
{
+ const AttributeDescription *desc = v_desc;
+ const AttrInfo *a = v_a;
return desc - a->ai_desc;
}
static int
ainfo_cmp(
- AttrInfo *a,
- AttrInfo *b
+ const void *v_a,
+ const void *v_b
)
{
+ const AttrInfo *a = v_a, *b = v_b;
return a->ai_desc - b->ai_desc;
}
{
AttrInfo *a;
- a = (AttrInfo *) avl_find( bdb->bi_attrs, desc,
- (AVL_CMP) ainfo_type_cmp );
+ a = (AttrInfo *) avl_find( bdb->bi_attrs, desc, ainfo_type_cmp );
*indexmask = a != NULL ? a->ai_indexmask : 0;
}
char **attrs;
char **indexes = NULL;
- attrs = str2charray( argv[0], "," );
+ attrs = ldap_str2charray( argv[0], "," );
if( attrs == NULL ) {
fprintf( stderr, "%s: line %d: "
}
if ( argc > 1 ) {
- indexes = str2charray( argv[1], "," );
+ indexes = ldap_str2charray( argv[1], "," );
if( indexes == NULL ) {
fprintf( stderr, "%s: line %d: "
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "attr_index_config: index %s 0x%04x\n",
- ad->ad_cname.bv_val, mask ));
+ LDAP_LOG( BACK_BDB, DETAIL1,
+ "attr_index_config: index %s 0x%04lx\n",
+ ad->ad_cname.bv_val, mask, 0 );
#else
- Debug( LDAP_DEBUG_CONFIG, "index %s 0x%04x\n",
+ Debug( LDAP_DEBUG_CONFIG, "index %s 0x%04lx\n",
ad->ad_cname.bv_val, mask, 0 );
#endif
a->ai_indexmask = mask;
rc = avl_insert( &bdb->bi_attrs, (caddr_t) a,
- (AVL_CMP) ainfo_cmp, (AVL_DUP) avl_dup_error );
+ ainfo_cmp, avl_dup_error );
if( rc ) {
fprintf( stderr, "%s: line %d: duplicate index definition "
}
}
- charray_free( attrs );
- if ( indexes != NULL ) charray_free( indexes );
+ ldap_charray_free( attrs );
+ if ( indexes != NULL ) ldap_charray_free( indexes );
return LDAP_SUCCESS;
}