Author: ivan
Date: Wed Apr 23 14:13:39 2014
New Revision: 1589421
URL: http://svn.apache.org/r1589421
Log:
Follow-up to r1589048: update callers of deprecated svn_repos_open2().
* subversion/libsvn_repos/authz.c
* subversion/libsvn_repos/config_pool.c
* subversion/svnadmin/svnadmin.c
* subversion/svnlook/svnlook.c
* subversion/tests/libsvn_repos/repos-test.c
* subversion/tests/svn_test_fs.c
* tools/server-side/svn-populate-node-origins-index.c
* tools/server-side/svn-rep-sharing-stats.c
* tools/server-side/svnauthz.c
(authz_retrieve_config_repo, find_repos_config, open_repos,
get_ctxt_baton, test_repos_fs_type, svn_test__create_repos,
build_index, process, get_authz_from_txn): Use svn_repos_open3()
instead of svn_repos_open2().
Modified:
subversion/trunk/subversion/libsvn_repos/authz.c
subversion/trunk/subversion/libsvn_repos/config_pool.c
subversion/trunk/subversion/svnadmin/svnadmin.c
subversion/trunk/subversion/svnlook/svnlook.c
subversion/trunk/subversion/tests/libsvn_repos/repos-test.c
subversion/trunk/subversion/tests/svn_test_fs.c
subversion/trunk/tools/server-side/svn-populate-node-origins-index.c
subversion/trunk/tools/server-side/svn-rep-sharing-stats.c
subversion/trunk/tools/server-side/svnauthz.c
Modified: subversion/trunk/subversion/libsvn_repos/authz.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/authz.c?rev=1589421&r1=1589420&r2=1589421&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/authz.c (original)
+++ subversion/trunk/subversion/libsvn_repos/authz.c Wed Apr 23 14:13:39 2014
@@ -800,7 +800,8 @@ authz_retrieve_config_repo(svn_config_t
"Unable to find repository at '%s'", dirent);
/* Attempt to open a repository at repos_root_dirent. */
- SVN_ERR(svn_repos_open2(&repos, repos_root_dirent, NULL, scratch_pool));
+ SVN_ERR(svn_repos_open3(&repos, repos_root_dirent, NULL, scratch_pool,
+ scratch_pool));
fs_path = &dirent[strlen(repos_root_dirent)];
Modified: subversion/trunk/subversion/libsvn_repos/config_pool.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/config_pool.c?rev=1589421&r1=1589420&r2=1589421&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/config_pool.c (original)
+++ subversion/trunk/subversion/libsvn_repos/config_pool.c Wed Apr 23 14:13:39
2014
@@ -337,7 +337,8 @@ find_repos_config(svn_config_t **cfg,
repos_root_dirent = svn_repos_find_root_path(dirent, scratch_pool);
/* Attempt to open a repository at repos_root_dirent. */
- SVN_ERR(svn_repos_open2(&repos, repos_root_dirent, NULL, scratch_pool));
+ SVN_ERR(svn_repos_open3(&repos, repos_root_dirent, NULL,
+ scratch_pool, scratch_pool));
}
fs_path = &dirent[strlen(repos_root_dirent)];
Modified: subversion/trunk/subversion/svnadmin/svnadmin.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1589421&r1=1589420&r2=1589421&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/svnadmin.c (original)
+++ subversion/trunk/subversion/svnadmin/svnadmin.c Wed Apr 23 14:13:39 2014
@@ -122,7 +122,7 @@ open_repos(svn_repos_t **repos,
svn_uuid_generate(pool));
/* now, open the requested repository */
- SVN_ERR(svn_repos_open2(repos, path, fs_config, pool));
+ SVN_ERR(svn_repos_open3(repos, path, fs_config, pool, pool));
svn_fs_set_warning_func(svn_repos_fs(*repos), warning_func, NULL);
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/svnlook/svnlook.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnlook/svnlook.c?rev=1589421&r1=1589420&r2=1589421&view=diff
==============================================================================
--- subversion/trunk/subversion/svnlook/svnlook.c (original)
+++ subversion/trunk/subversion/svnlook/svnlook.c Wed Apr 23 14:13:39 2014
@@ -2076,8 +2076,8 @@ get_ctxt_baton(svnlook_ctxt_t **baton_p,
{
svnlook_ctxt_t *baton = apr_pcalloc(pool, sizeof(*baton));
- SVN_ERR(svn_repos_open2(&(baton->repos), opt_state->repos_path, NULL,
- pool));
+ SVN_ERR(svn_repos_open3(&(baton->repos), opt_state->repos_path, NULL,
+ pool, pool));
baton->fs = svn_repos_fs(baton->repos);
svn_fs_set_warning_func(baton->fs, warning_func, NULL);
baton->show_ids = opt_state->show_ids;
Modified: subversion/trunk/subversion/tests/libsvn_repos/repos-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_repos/repos-test.c?rev=1589421&r1=1589420&r2=1589421&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_repos/repos-test.c Wed Apr 23
14:13:39 2014
@@ -3531,7 +3531,8 @@ test_repos_fs_type(const svn_test_opts_t
SVN_TEST_STRING_ASSERT(svn_repos_fs_type(repos, pool), opts->fs_type);
/* Re-open repository and verify fs-type again. */
- SVN_ERR(svn_repos_open2(&repos, svn_repos_path(repos, pool), NULL, pool));
+ SVN_ERR(svn_repos_open3(&repos, svn_repos_path(repos, pool), NULL,
+ pool, pool));
SVN_TEST_STRING_ASSERT(svn_repos_fs_type(repos, pool), opts->fs_type);
Modified: subversion/trunk/subversion/tests/svn_test_fs.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test_fs.c?rev=1589421&r1=1589420&r2=1589421&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/svn_test_fs.c (original)
+++ subversion/trunk/subversion/tests/svn_test_fs.c Wed Apr 23 14:13:39 2014
@@ -249,7 +249,7 @@ svn_test__create_repos(svn_repos_t **rep
pool));
if (must_reopen)
{
- SVN_ERR(svn_repos_open2(&repos, name, NULL, pool));
+ SVN_ERR(svn_repos_open3(&repos, name, NULL, pool, pool));
svn_fs_set_warning_func(svn_repos_fs(repos), fs_warning_handler, NULL);
}
Modified: subversion/trunk/tools/server-side/svn-populate-node-origins-index.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svn-populate-node-origins-index.c?rev=1589421&r1=1589420&r2=1589421&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svn-populate-node-origins-index.c
(original)
+++ subversion/trunk/tools/server-side/svn-populate-node-origins-index.c Wed
Apr 23 14:13:39 2014
@@ -124,7 +124,7 @@ build_index(const char *repos_path, apr_
apr_pool_t *subpool;
/* Open the repository. */
- SVN_ERR(svn_repos_open2(&repos, repos_path, NULL, pool));
+ SVN_ERR(svn_repos_open3(&repos, repos_path, NULL, pool, pool));
/* Get a filesystem object. */
fs = svn_repos_fs(repos);
Modified: subversion/trunk/tools/server-side/svn-rep-sharing-stats.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svn-rep-sharing-stats.c?rev=1589421&r1=1589420&r2=1589421&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svn-rep-sharing-stats.c (original)
+++ subversion/trunk/tools/server-side/svn-rep-sharing-stats.c Wed Apr 23
14:13:39 2014
@@ -396,7 +396,8 @@ static svn_error_t *process(const char *
both_reps = apr_hash_make(scratch_pool);
/* Open the FS. */
- SVN_ERR(svn_repos_open2(&repos, repos_path, NULL, scratch_pool));
+ SVN_ERR(svn_repos_open3(&repos, repos_path, NULL, scratch_pool,
+ scratch_pool));
fs = svn_repos_fs(repos);
SVN_ERR(is_fs_fsfs(fs, scratch_pool));
Modified: subversion/trunk/tools/server-side/svnauthz.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnauthz.c?rev=1589421&r1=1589420&r2=1589421&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnauthz.c (original)
+++ subversion/trunk/tools/server-side/svnauthz.c Wed Apr 23 14:13:39 2014
@@ -234,7 +234,7 @@ get_authz_from_txn(svn_authz_t **authz,
svn_error_t *err;
/* Open up the repository and find the transaction root */
- SVN_ERR(svn_repos_open2(&repos, repos_path, NULL, pool));
+ SVN_ERR(svn_repos_open3(&repos, repos_path, NULL, pool, pool));
fs = svn_repos_fs(repos);
SVN_ERR(svn_fs_open_txn(&txn, fs, txn_name, pool));
SVN_ERR(svn_fs_txn_root(&root, txn, pool));
