Author: rhuijben
Date: Wed Feb 25 19:18:09 2015
New Revision: 1662295
URL: http://svn.apache.org/r1662295
Log:
Simplify some code.
* subversion/libsvn_wc/entries.c
(entries_read_baton_t,
entries_read_txn): Fold into...
(svn_wc__entries_read_internal): ... this using helper macro.
Modified:
subversion/trunk/subversion/libsvn_wc/entries.c
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1662295&r1=1662294&r2=1662295&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Wed Feb 25 19:18:09 2015
@@ -1373,25 +1373,6 @@ prune_deleted(apr_hash_t **entries_prune
return SVN_NO_ERROR;
}
-struct entries_read_baton_t
-{
- apr_hash_t **new_entries;
- svn_wc__db_t *db;
- const char *local_abspath;
- apr_pool_t *result_pool;
-};
-
-static svn_error_t *
-entries_read_txn(void *baton, svn_sqlite__db_t *db, apr_pool_t *scratch_pool)
-{
- struct entries_read_baton_t *erb = baton;
-
- SVN_ERR(read_entries(erb->new_entries, erb->db, erb->local_abspath,
- erb->result_pool, scratch_pool));
-
- return NULL;
-}
-
svn_error_t *
svn_wc__entries_read_internal(apr_hash_t **entries,
svn_wc_adm_access_t *adm_access,
@@ -1407,7 +1388,6 @@ svn_wc__entries_read_internal(apr_hash_t
const char *local_abspath = svn_wc__adm_access_abspath(adm_access);
apr_pool_t *result_pool = svn_wc__adm_access_pool_internal(adm_access);
svn_sqlite__db_t *sdb;
- struct entries_read_baton_t erb;
/* ### Use the borrow DB api to handle all calls in a single read
### transaction. This api is used extensively in our test suite
@@ -1415,12 +1395,9 @@ svn_wc__entries_read_internal(apr_hash_t
SVN_ERR(svn_wc__db_temp_borrow_sdb(&sdb, db, local_abspath, pool));
- erb.db = db;
- erb.local_abspath = local_abspath;
- erb.new_entries = &new_entries;
- erb.result_pool = result_pool;
-
- SVN_ERR(svn_sqlite__with_lock(sdb, entries_read_txn, &erb, pool));
+ SVN_SQLITE__WITH_LOCK(read_entries(&new_entries, db, local_abspath,
+ result_pool, pool),
+ sdb);
svn_wc__adm_access_set_entries(adm_access, new_entries);
}
