use ldap_charray_*() instead of charray_*()

[openldap] / servers / slapd / back-bdb / attr.c

diff --git a/servers/slapd/back-bdb/attr.c b/servers/slapd/back-bdb/attr.c
index c05cfc393390b46624cc01f5b3531c55d89ef096..07bfc92cabec4f606fb32f8d4c53b8e3466a4c4e 100644 (file)
--- a/servers/slapd/back-bdb/attr.c
+++ b/servers/slapd/back-bdb/attr.c
@@ -67,7 +67,7 @@ bdb_attr_index_config(
        char **attrs;
        char **indexes = NULL;
 
-       attrs = str2charray( argv[0], "," );
+       attrs = ldap_str2charray( argv[0], "," );
 
        if( attrs == NULL ) {
                fprintf( stderr, "%s: line %d: "
@@ -77,7 +77,7 @@ bdb_attr_index_config(
        }
 
        if ( argc > 1 ) {
-               indexes = str2charray( argv[1], "," );
+               indexes = ldap_str2charray( argv[1], "," );
 
                if( indexes == NULL ) {
                        fprintf( stderr, "%s: line %d: "
@@ -181,9 +181,9 @@ bdb_attr_index_config(
                }
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+               LDAP_LOG( BACK_BDB, DETAIL1, 
                        "attr_index_config: index %s 0x%04lx\n",
-                       ad->ad_cname.bv_val, mask ));
+                       ad->ad_cname.bv_val, mask, 0 );
 #else
                Debug( LDAP_DEBUG_CONFIG, "index %s 0x%04lx\n",
                        ad->ad_cname.bv_val, mask, 0 ); 
@@ -205,8 +205,8 @@ bdb_attr_index_config(
                }
        }
 
-       charray_free( attrs );
-       if ( indexes != NULL ) charray_free( indexes );
+       ldap_charray_free( attrs );
+       if ( indexes != NULL ) ldap_charray_free( indexes );
 
        return LDAP_SUCCESS;
 }