* subversion/include/svn_fs.h (svn_fs_purge_txn): Was svn_fs_cleanup_dead_txn. This name is more k-r4d. * subversion/libsvn_fs/revs-txns.c (svn_fs_purge_txn): Was svn_fs_cleanup_dead_txn(). (svn_fs_abort_txn): Update call to svn_fs_purge_txn(). git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/issue-1578-dev@847798 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/include/svn_fs.h b/subversion/include/svn_fs.h index af0e005..8f73f76 100644 --- a/subversion/include/svn_fs.h +++ b/subversion/include/svn_fs.h
@@ -444,9 +444,9 @@ * the error @c SVN_ERR_FS_TRANSACTION_NOT_DEAD is returned. (The * caller probably forgot to abort the transcation.) */ -svn_error_t *svn_fs_cleanup_dead_txn (svn_fs_t *fs, - const char *txn_id, - apr_pool_t *pool); +svn_error_t *svn_fs_purge_txn (svn_fs_t *fs, + const char *txn_id, + apr_pool_t *pool); /** Set @a *name_p to the name of the transaction @a txn, as a
diff --git a/subversion/libsvn_fs/revs-txns.c b/subversion/libsvn_fs/revs-txns.c index a7e14aa..93f1224 100644 --- a/subversion/libsvn_fs/revs-txns.c +++ b/subversion/libsvn_fs/revs-txns.c
@@ -838,9 +838,9 @@ svn_error_t * -svn_fs_cleanup_dead_txn (svn_fs_t *fs, - const char *txn_id, - apr_pool_t *pool) +svn_fs_purge_txn (svn_fs_t *fs, + const char *txn_id, + apr_pool_t *pool) { struct cleanup_txn_args args; svn_fs__transaction_t *txn; @@ -904,9 +904,10 @@ /* Set the transaction to "dead". */ SVN_ERR (svn_fs__retry_txn (txn->fs, txn_body_abort_txn, txn, pool)); - /* Now, clean it up. */ - SVN_ERR_W (svn_fs_cleanup_dead_txn (txn->fs, txn->id, pool), + /* Now, purge it. */ + SVN_ERR_W (svn_fs_purge_txn (txn->fs, txn->id, pool), "Transaction aborted, but cleanup failed"); + return SVN_NO_ERROR; }