svn commit: r1597415 - in /subversion/trunk/subversion: libsvn_ra_local/split_url.c tests/libsvn_repos/dump-load-test.c

[st...@apache.org]

Author: stefan2
Date: Sun May 25 11:39:03 2014
New Revision: 1597415

URL: http://svn.apache.org/r1597415
Log:
Follow-up to r1589048:
Fix deprecation warnings by (trivally) updating callers.

* subversion/libsvn_ra_local/split_url.c
  (svn_ra_local__split_URL): Upgrade call to latest API; no separate
                             scratch pool available.

* subversion/tests/libsvn_repos/dump-load-test.c
  (test_dump_r0_mergeinfo): Tests need no extra flags for txn control.
                            Trivially upgrade call to latest API.

Modified:
    subversion/trunk/subversion/libsvn_ra_local/split_url.c
    subversion/trunk/subversion/tests/libsvn_repos/dump-load-test.c

Modified: subversion/trunk/subversion/libsvn_ra_local/split_url.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_local/split_url.c?rev=1597415&r1=1597414&r2=1597415&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_local/split_url.c (original)
+++ subversion/trunk/subversion/libsvn_ra_local/split_url.c Sun May 25 11:39:03 2014
@@ -50,7 +50,7 @@ svn_ra_local__split_URL(svn_repos_t **re
                              _("Unable to open repository '%s'"), URL);
 
   /* Attempt to open a repository at URL. */
-  err = svn_repos_open2(repos, repos_root_dirent, NULL, pool);
+  err = svn_repos_open3(repos, repos_root_dirent, NULL, pool, pool);
   if (err)
     return svn_error_createf(SVN_ERR_RA_LOCAL_REPOS_OPEN_FAILED, err,
                              _("Unable to open repository '%s'"), URL);

Modified: subversion/trunk/subversion/tests/libsvn_repos/dump-load-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_repos/dump-load-test.c?rev=1597415&r1=1597414&r2=1597415&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_repos/dump-load-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_repos/dump-load-test.c Sun May 25 11:39:03 2014
@@ -63,14 +63,14 @@ test_dump_r0_mergeinfo(const svn_test_op
   fs = svn_repos_fs(repos);
 
   /* Revision 1:  Any commit will do, here  */
-  SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, pool));
+  SVN_ERR(svn_fs_begin_txn2(&txn, fs, youngest_rev, 0, pool));
   SVN_ERR(svn_fs_txn_root(&txn_root, txn, pool));
   SVN_ERR(svn_fs_make_dir(txn_root, "/bar", pool));
   SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, pool));
   SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
 
   /* Revision 2:  Add bad mergeinfo */
-  SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, pool));
+  SVN_ERR(svn_fs_begin_txn2(&txn, fs, youngest_rev, 0, pool));
   SVN_ERR(svn_fs_txn_root(&txn_root, txn, pool));
   SVN_ERR(svn_fs_change_node_prop(txn_root, "/bar", "svn:mergeinfo", bad_mergeinfo, pool));
   SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, pool));