upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 00:29:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename mdb_open/close mdb_dbi_open/close

Browse source
This commit is contained in:
Howard Chu 2012-12-03 17:06:31 -08:00
parent f9d41ba98a
commit fe9e1113ae
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servers/slapd/back-mdb/attr.c
View file

@ -120,11 +120,11 @@ mdb_attr_dbs_open(
for ( i=0; i<mdb->mi_nattrs; i++ ) {
if ( mdb->mi_attrs[i]->ai_dbi ) /* already open */
continue;
rc = mdb_open( txn, mdb->mi_attrs[i]->ai_desc->ad_type->sat_cname.bv_val,
rc = mdb_dbi_open( txn, mdb->mi_attrs[i]->ai_desc->ad_type->sat_cname.bv_val,
flags, &mdb->mi_attrs[i]->ai_dbi );
if ( rc ) {
snprintf( cr->msg, sizeof(cr->msg), "database \"%s\": "
"mdb_open(%s) failed: %s (%d).",
"mdb_dbi_open(%s) failed: %s (%d).",
be->be_suffix[0].bv_val,
mdb->mi_attrs[i]->ai_desc->ad_type->sat_cname.bv_val,
mdb_strerror(rc), rc );
@ -163,7 +163,7 @@ mdb_attr_dbs_close(
int i;
for ( i=0; i<mdb->mi_nattrs; i++ )
if ( mdb->mi_attrs[i]->ai_dbi ) {
mdb_close( mdb->mi_dbenv, mdb->mi_attrs[i]->ai_dbi );
mdb_dbi_close( mdb->mi_dbenv, mdb->mi_attrs[i]->ai_dbi );
mdb->mi_attrs[i]->ai_dbi = 0;
}
}

6
servers/slapd/back-mdb/init.c
View file

@ -204,14 +204,14 @@ mdb_db_open( BackendDB *be, ConfigReply *cr )
flags |= MDB_CREATE;
}
rc = mdb_open( txn,
rc = mdb_dbi_open( txn,
mdmi_databases[i].bv_val,
flags,
&mdb->mi_dbis[i] );
if ( rc != 0 ) {
snprintf( cr->msg, sizeof(cr->msg), "database \"%s\": "
"mdb_open(%s/%s) failed: %s (%d).",
"mdb_dbi_open(%s/%s) failed: %s (%d).",
be->be_suffix[0].bv_val,
mdb->mi_dbenv_home, mdmi_databases[i].bv_val,
mdb_strerror(rc), rc );
@ -281,7 +281,7 @@ mdb_db_close( BackendDB *be, ConfigReply *cr )
mdb_attr_dbs_close( mdb );
for ( i=0; i<MDB_NDB; i++ )
mdb_close( mdb->mi_dbenv, mdb->mi_dbis[i] );
mdb_dbi_close( mdb->mi_dbenv, mdb->mi_dbis[i] );
/* force a sync, but not if we were ReadOnly,
* and not in Quick mode.