Author: stefan2
Date: Sat Oct 20 16:06:56 2012
New Revision: 1400483
URL: http://svn.apache.org/viewvc?rev=1400483&view=rev
Log:
Fix a number of deprecated function calls. They all require only simple
parameter adaptations.
* subversion/libsvn_ra/compat.c
(svn_ra__get_inherited_props_walk): call svn_property_kind2
instead of svn_property_kind
* subversion/libsvn_subr/path.c
(svn_path_url_add_component2): call internal, non-deprecated function
* subversion/libsvn_wc/tree_conflicts.c
(read_node_version_info): call svn_wc_conflict_version_create2 instead
of svn_wc_conflict_version_create
* subversion/tests/libsvn_wc/conflict-data-test.c
(tree_conflict_create): ditto
* tools/dev/svnraisetreeconflict/main.c
(raise_tree_conflict): ditto
* subversion/svnrdump/svnrdump.c
(init_client_context): call svn_client_create_context2 instead of
svn_client_create_context
* subversion/tests/libsvn_wc/utils.c
(create_repos_and_wc): ditto
* tools/client-side/svn-bench/main.c
(sub_main): ditto
Modified:
subversion/trunk/subversion/libsvn_ra/compat.c
subversion/trunk/subversion/libsvn_subr/path.c
subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
subversion/trunk/subversion/svnrdump/svnrdump.c
subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c
subversion/trunk/subversion/tests/libsvn_wc/utils.c
subversion/trunk/tools/client-side/svn-bench/main.c
subversion/trunk/tools/dev/svnraisetreeconflict/main.c
Modified: subversion/trunk/subversion/libsvn_ra/compat.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/compat.c?rev=1400483&r1=1400482&r2=1400483&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/compat.c (original)
+++ subversion/trunk/subversion/libsvn_ra/compat.c Sat Oct 20 16:06:56 2012
@@ -934,7 +934,7 @@ svn_ra__get_inherited_props_walk(svn_ra_
apr_ssize_t klen = svn__apr_hash_index_klen(hi);
svn_string_t *value = svn__apr_hash_index_val(hi);
- if (svn_property_kind(NULL, name) == svn_prop_regular_kind)
+ if (svn_property_kind2(name) == svn_prop_regular_kind)
{
name = apr_pstrdup(result_pool, name);
value = svn_string_dup(value, result_pool);
Modified: subversion/trunk/subversion/libsvn_subr/path.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/path.c?rev=1400483&r1=1400482&r2=1400483&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/path.c (original)
+++ subversion/trunk/subversion/libsvn_subr/path.c Sat Oct 20 16:06:56 2012
@@ -1082,7 +1082,7 @@ svn_path_url_add_component2(const char *
/* = svn_path_uri_encode() but without always copying */
component = uri_escape(component, svn_uri__char_validity, pool);
- return svn_path_join(url, component, pool);
+ return svn_path_join_internal(url, component, pool);
}
svn_error_t *
Modified: subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/tree_conflicts.c?rev=1400483&r1=1400482&r2=1400483&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/tree_conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/tree_conflicts.c Sat Oct 20 16:06:56
2012
@@ -182,11 +182,12 @@ read_node_version_info(const svn_wc_conf
skel->children->next->next->next->next));
kind = (svn_node_kind_t)n;
- *version_info = svn_wc_conflict_version_create(repos_root,
- repos_relpath,
- peg_rev,
- kind,
- result_pool);
+ *version_info = svn_wc_conflict_version_create2(repos_root,
+ NULL,
+ repos_relpath,
+ peg_rev,
+ kind,
+ result_pool);
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/svnrdump/svnrdump.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/svnrdump.c?rev=1400483&r1=1400482&r2=1400483&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/svnrdump.c (original)
+++ subversion/trunk/subversion/svnrdump/svnrdump.c Sat Oct 20 16:06:56 2012
@@ -270,7 +270,7 @@ init_client_context(svn_client_ctx_t **c
SVN_ERR(svn_ra_initialize(pool));
SVN_ERR(svn_config_ensure(config_dir, pool));
- SVN_ERR(svn_client_create_context(&ctx, pool));
+ SVN_ERR(svn_client_create_context2(&ctx, NULL, pool));
SVN_ERR(svn_config_get_config(&(ctx->config), config_dir, pool));
Modified: subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c?rev=1400483&r1=1400482&r2=1400483&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c Sat Oct 20
16:06:56 2012
@@ -113,10 +113,11 @@ tree_conflict_create(const char *local_a
svn_wc_conflict_version_t *left, *right;
svn_wc_conflict_description2_t *conflict;
- left = svn_wc_conflict_version_create(left_repo, left_path, left_revnum,
- left_kind, result_pool);
- right = svn_wc_conflict_version_create(right_repo, right_path, right_revnum,
- right_kind, result_pool);
+ left = svn_wc_conflict_version_create2(left_repo, NULL, left_path,
+ left_revnum, left_kind, result_pool);
+ right = svn_wc_conflict_version_create2(right_repo, NULL, right_path,
+ right_revnum, right_kind,
+ result_pool);
conflict = svn_wc_conflict_description_create_tree2(
local_abspath, node_kind, operation,
left, right, result_pool);
Modified: subversion/trunk/subversion/tests/libsvn_wc/utils.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/utils.c?rev=1400483&r1=1400482&r2=1400483&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/utils.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/utils.c Sat Oct 20 16:06:56 2012
@@ -85,7 +85,7 @@ create_repos_and_wc(const char **repos_u
svn_client_ctx_t *ctx;
svn_opt_revision_t head_rev = { svn_opt_revision_head, {0} };
- SVN_ERR(svn_client_create_context(&ctx, subpool));
+ SVN_ERR(svn_client_create_context2(&ctx, NULL, subpool));
SVN_ERR(svn_dirent_get_absolute(wc_abspath, wc_path, pool));
SVN_ERR(svn_client_checkout3(NULL, *repos_url, *wc_abspath,
&head_rev, &head_rev, svn_depth_infinity,
Modified: subversion/trunk/tools/client-side/svn-bench/main.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-bench/main.c?rev=1400483&r1=1400482&r2=1400483&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svn-bench/main.c (original)
+++ subversion/trunk/tools/client-side/svn-bench/main.c Sat Oct 20 16:06:56 2012
@@ -783,7 +783,7 @@ sub_main(int argc, const char *argv[], a
/* Create a client context object. */
command_baton.opt_state = &opt_state;
- SVN_INT_ERR(svn_client_create_context(&ctx, pool));
+ SVN_INT_ERR(svn_client_create_context2(&ctx, NULL, pool));
command_baton.ctx = ctx;
/* Only a few commands can accept a revision range; the rest can take at
Modified: subversion/trunk/tools/dev/svnraisetreeconflict/main.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/svnraisetreeconflict/main.c?rev=1400483&r1=1400482&r2=1400483&view=diff
==============================================================================
--- subversion/trunk/tools/dev/svnraisetreeconflict/main.c (original)
+++ subversion/trunk/tools/dev/svnraisetreeconflict/main.c Sat Oct 20 16:06:56
2012
@@ -218,10 +218,10 @@ raise_tree_conflict(int argc, const char
/* Allocate and fill in the description data structures */
SVN_ERR(svn_dirent_get_absolute(&wc_abspath, wc_path, pool));
- left = svn_wc_conflict_version_create(repos_url1, path_in_repos1, peg_rev1,
- kind1, pool);
- right = svn_wc_conflict_version_create(repos_url2, path_in_repos2, peg_rev2,
- kind2, pool);
+ left = svn_wc_conflict_version_create2(repos_url1, NULL, path_in_repos1,
+ peg_rev1, kind1, pool);
+ right = svn_wc_conflict_version_create2(repos_url2, NULL, path_in_repos2,
+ peg_rev2, kind2, pool);
c = svn_wc_conflict_description_create_tree2(wc_abspath, kind,
operation, left, right, pool);
c->action = (svn_wc_conflict_action_t)action;
