X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fdelete.c;h=a469fb1265ed84f0c5fea9b7a2c3b42af47c43e2;hb=6df9b5459294bcc9adf27f048508d43eea58a203;hp=24d4f2ecb49404d0431762a5a994c1c11d030a4b;hpb=b57c11f4bd23e0fe9dec8bae3af2fcd7494a8f98;p=openldap diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c index 24d4f2ecb4..a469fb1265 100644 --- a/servers/slapd/back-bdb/delete.c +++ b/servers/slapd/back-bdb/delete.c @@ -47,7 +47,7 @@ retry: /* transaction retry */ } Debug( LDAP_DEBUG_TRACE, "==> bdb_delete: retrying...\n", 0, 0, 0 ); - rc = txn_abort( ltid ); + rc = TXN_ABORT( ltid ); ltid = NULL; op->o_private = NULL; if( rc != 0 ) { @@ -59,7 +59,7 @@ retry: /* transaction retry */ } /* begin transaction */ - rc = txn_begin( bdb->bi_dbenv, NULL, <id, + rc = TXN_BEGIN( bdb->bi_dbenv, NULL, <id, bdb->bi_db_opflags ); text = NULL; if( rc != 0 ) { @@ -332,9 +332,9 @@ retry: /* transaction retry */ #endif if( op->o_noop ) { - rc = txn_abort( ltid ); + rc = TXN_ABORT( ltid ); } else { - rc = txn_commit( ltid, 0 ); + rc = TXN_COMMIT( ltid, 0 ); } ltid = NULL; op->o_private = NULL; @@ -372,7 +372,7 @@ done: } if( ltid != NULL ) { - txn_abort( ltid ); + TXN_ABORT( ltid ); op->o_private = NULL; }