s/leave/func_leave/ to avoid OSF1 name clashing (ITS#5411)

This commit is contained in:
Pierangelo Masarati 2008-03-12 22:45:18 +00:00
parent 5417aa895a
commit d22b8532ee

View file

@ -302,7 +302,7 @@ bdb_dn2id(
data.flags = DB_DBT_USERMEM;
rc = db->cursor( db, NULL, &cursor, bdb->bi_db_opflags );
if ( rc ) goto leave;
if ( rc ) goto func_leave;
rc = bdb_dn2id_lock( bdb, dn, 0, locker, lock );
if ( rc ) goto nolock;
@ -316,7 +316,7 @@ bdb_dn2id(
nolock:
cursor->c_close( cursor );
leave:
func_leave:
if( rc != 0 ) {
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: get failed: %s (%d)\n",
@ -624,7 +624,7 @@ hdb_dn2id_add(
}
}
leave:
func_leave:
op->o_tmpfree( d, op->o_tmpmemctx );
Debug( LDAP_DEBUG_TRACE, "<= hdb_dn2id_add 0x%lx: %d\n", e->e_id, rc, 0 );
@ -674,7 +674,7 @@ hdb_dn2id_delete(
data.data = d;
rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );
if ( rc ) goto leave;
if ( rc ) goto func_leave;
/* We hold this lock until the TXN completes */
rc = bdb_dn2id_lock( bdb, &e->e_nname, 1, TXN_ID( txn ), &lock );
@ -703,7 +703,7 @@ hdb_dn2id_delete(
nolock:
cursor->c_close( cursor );
leave:
func_leave:
op->o_tmpfree( d, op->o_tmpmemctx );
/* Delete IDL cache entries */
@ -779,7 +779,7 @@ hdb_dn2id(
data.data = d;
rc = bdb_dn2id_lock( bdb, in, 0, locker, lock );
if ( rc ) goto leave;
if ( rc ) goto func_leave;
rc = cursor->c_get( cursor, &key, &data, DB_GET_BOTH_RANGE );
if ( rc == 0 && (dlen[1] != d->nrdnlen[1] || dlen[0] != d->nrdnlen[0] ||
@ -803,7 +803,7 @@ hdb_dn2id(
}
}
leave:
func_leave:
cursor->c_close( cursor );
op->o_tmpfree( d, op->o_tmpmemctx );
if( rc != 0 ) {