You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/01/03 20:43:33 UTC
svn commit: r1054721 - in /subversion/trunk/subversion: libsvn_ra/compat.c
libsvn_ra_neon/fetch.c libsvn_ra_neon/file_revs.c
libsvn_ra_neon/get_locations.c libsvn_ra_neon/lock.c libsvn_ra_neon/log.c
libsvn_ra_neon/mergeinfo.c libsvn_ra_neon/props.c
Author: hwright
Date: Mon Jan 3 19:43:33 2011
New Revision: 1054721
URL: http://svn.apache.org/viewvc?rev=1054721&view=rev
Log:
Update some uses of svn_path_url_add_component() to it's non-deprecated brother:
svn_path_url_add_component2(). I've done some spot checking to see if these
uses conform to the more strict requirements of the newer API. Even though my
checking hasn't been comprehensive, I think this patch is correct.
* subversion/libsvn_ra/compat.c
(svn_ra__get_deleted_rev_from_log),
* subversion/libsvn_ra_neon/props.c
(svn_ra_neon__get_baseline_info, svn_ra_neon__do_check_path,
svn_ra_neon__do_stat),
* subversion/libsvn_ra_neon/mergeinfo.c
(svn_ra_neon__get_mergeinfo),
* subversion/libsvn_ra_neon/file_revs.c
(svn_ra_neon__get_file_revs),
* subversion/libsvn_ra_neon/log.c
(svn_ra_neon__get_log),
* subversion/libsvn_ra_neon/lock.c
(do_lock, do_unlock, svn_ra_neon__get_lock_internal),
* subversion/libsvn_ra_neon/fetch.c
(svn_ra_neon__get_file, svn_ra_neon__get_dir),
* subversion/libsvn_ra_neon/get_locations.c
(svn_ra_neon__get_locations):
As above.
Modified:
subversion/trunk/subversion/libsvn_ra/compat.c
subversion/trunk/subversion/libsvn_ra_neon/fetch.c
subversion/trunk/subversion/libsvn_ra_neon/file_revs.c
subversion/trunk/subversion/libsvn_ra_neon/get_locations.c
subversion/trunk/subversion/libsvn_ra_neon/lock.c
subversion/trunk/subversion/libsvn_ra_neon/log.c
subversion/trunk/subversion/libsvn_ra_neon/mergeinfo.c
subversion/trunk/subversion/libsvn_ra_neon/props.c
Modified: subversion/trunk/subversion/libsvn_ra/compat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/compat.c?rev=1054721&r1=1054720&r2=1054721&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/compat.c (original)
+++ subversion/trunk/subversion/libsvn_ra/compat.c Mon Jan 3 19:43:33 2011
@@ -851,8 +851,8 @@ svn_ra__get_deleted_rev_from_log(svn_ra_
SVN_ERR(svn_ra_get_session_url(session, &session_url, pool));
SVN_ERR(svn_ra_get_repos_root2(session, &source_root_url, pool));
- rel_path_url = svn_path_url_add_component(session_url, rel_deleted_path,
- pool);
+ rel_path_url = svn_path_url_add_component2(session_url, rel_deleted_path,
+ pool);
abs_del_path = svn_path_uri_decode(rel_path_url + strlen(source_root_url), pool);
log_path_deleted_baton.path = abs_del_path;
log_path_deleted_baton.revision_deleted = SVN_INVALID_REVNUM;
Modified: subversion/trunk/subversion/libsvn_ra_neon/fetch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/fetch.c?rev=1054721&r1=1054720&r2=1054721&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/fetch.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/fetch.c Mon Jan 3 19:43:33 2011
@@ -664,7 +664,7 @@ svn_error_t *svn_ra_neon__get_file(svn_r
svn_ra_neon__resource_t *rsrc;
const char *final_url;
svn_ra_neon__session_t *ras = session->priv;
- const char *url = svn_path_url_add_component(ras->url->data, path, pool);
+ const char *url = svn_path_url_add_component2(ras->url->data, path, pool);
/* If the revision is invalid (head), then we're done. Just fetch
the public URL, because that will always get HEAD. */
@@ -683,9 +683,9 @@ svn_error_t *svn_ra_neon__get_file(svn_r
ras,
url, revision,
pool));
- final_url = svn_path_url_add_component(bc_url.data,
- bc_relative.data,
- pool);
+ final_url = svn_path_url_add_component2(bc_url.data,
+ bc_relative.data,
+ pool);
if (fetched_rev != NULL)
*fetched_rev = got_rev;
}
@@ -789,7 +789,7 @@ svn_error_t *svn_ra_neon__get_dir(svn_ra
apr_size_t final_url_n_components;
svn_boolean_t supports_deadprop_count;
svn_ra_neon__session_t *ras = session->priv;
- const char *url = svn_path_url_add_component(ras->url->data, path, pool);
+ const char *url = svn_path_url_add_component2(ras->url->data, path, pool);
/* If the revision is invalid (head), then we're done. Just fetch
the public URL, because that will always get HEAD. */
@@ -808,9 +808,9 @@ svn_error_t *svn_ra_neon__get_dir(svn_ra
ras,
url, revision,
pool));
- final_url = svn_path_url_add_component(bc_url.data,
- bc_relative.data,
- pool);
+ final_url = svn_path_url_add_component2(bc_url.data,
+ bc_relative.data,
+ pool);
if (fetched_rev != NULL)
*fetched_rev = got_rev;
}
Modified: subversion/trunk/subversion/libsvn_ra_neon/file_revs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/file_revs.c?rev=1054721&r1=1054720&r2=1054721&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/file_revs.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/file_revs.c Mon Jan 3 19:43:33 2011
@@ -359,8 +359,8 @@ svn_ra_neon__get_file_revs(svn_ra_sessio
SVN_ERR(svn_ra_neon__get_baseline_info(NULL, &bc_url, &bc_relative, NULL,
ras, ras->url->data, end,
pool));
- final_bc_url = svn_path_url_add_component(bc_url.data, bc_relative.data,
- pool);
+ final_bc_url = svn_path_url_add_component2(bc_url.data, bc_relative.data,
+ pool);
/* Dispatch the request. */
err = svn_ra_neon__parsed_request(ras, "REPORT", final_bc_url,
Modified: subversion/trunk/subversion/libsvn_ra_neon/get_locations.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/get_locations.c?rev=1054721&r1=1054720&r2=1054721&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/get_locations.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/get_locations.c Mon Jan 3 19:43:33 2011
@@ -178,8 +178,8 @@ svn_ra_neon__get_locations(svn_ra_sessio
ras, ras->url->data,
peg_revision,
pool));
- final_bc_url = svn_path_url_add_component(bc_url.data, bc_relative.data,
- pool);
+ final_bc_url = svn_path_url_add_component2(bc_url.data, bc_relative.data,
+ pool);
err = svn_ra_neon__parsed_request(ras, "REPORT", final_bc_url,
request_body->data, NULL, NULL,
Modified: subversion/trunk/subversion/libsvn_ra_neon/lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/lock.c?rev=1054721&r1=1054720&r2=1054721&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/lock.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/lock.c Mon Jan 3 19:43:33 2011
@@ -250,7 +250,7 @@ do_lock(svn_lock_t **lock,
svn_error_t *err = SVN_NO_ERROR;
/* To begin, we convert the incoming path into an absolute fs-path. */
- url = svn_path_url_add_component(ras->url->data, path, pool);
+ url = svn_path_url_add_component2(ras->url->data, path, pool);
SVN_ERR(svn_ra_neon__get_baseline_info(NULL, NULL, &fs_path, NULL, ras,
url, SVN_INVALID_REVNUM, pool));
@@ -402,7 +402,7 @@ do_unlock(svn_ra_session_t *session,
apr_hash_t *extra_headers = apr_hash_make(pool);
/* Make a neon lock structure containing token and full URL to unlock. */
- url = svn_path_url_add_component(ras->url->data, path, pool);
+ url = svn_path_url_add_component2(ras->url->data, path, pool);
if (ne_uri_parse(url, &uri) != 0)
{
ne_uri_free(&uri);
@@ -524,7 +524,7 @@ svn_ra_neon__get_lock_internal(svn_ra_ne
"</D:propfind>";
/* To begin, we convert the incoming path into an absolute fs-path. */
- url = svn_path_url_add_component(ras->url->data, path, pool);
+ url = svn_path_url_add_component2(ras->url->data, path, pool);
err = svn_ra_neon__get_baseline_info(NULL, NULL, &fs_path, NULL, ras,
url, SVN_INVALID_REVNUM, pool);
Modified: subversion/trunk/subversion/libsvn_ra_neon/log.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/log.c?rev=1054721&r1=1054720&r2=1054721&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/log.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/log.c Mon Jan 3 19:43:33 2011
@@ -498,8 +498,8 @@ svn_error_t * svn_ra_neon__get_log(svn_r
SVN_ERR(svn_ra_neon__get_baseline_info(NULL, &bc_url, &bc_relative, NULL,
ras, ras->url->data, use_rev,
pool));
- final_bc_url = svn_path_url_add_component(bc_url.data, bc_relative.data,
- pool);
+ final_bc_url = svn_path_url_add_component2(bc_url.data, bc_relative.data,
+ pool);
err = svn_ra_neon__parsed_request(ras,
Modified: subversion/trunk/subversion/libsvn_ra_neon/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/mergeinfo.c?rev=1054721&r1=1054720&r2=1054721&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/mergeinfo.c Mon Jan 3 19:43:33 2011
@@ -250,8 +250,8 @@ svn_ra_neon__get_mergeinfo(svn_ra_sessio
SVN_ERR(svn_ra_neon__get_baseline_info(NULL, &bc_url, &bc_relative, NULL,
ras, ras->url->data, revision,
pool));
- final_bc_url = svn_path_url_add_component(bc_url.data, bc_relative.data,
- pool);
+ final_bc_url = svn_path_url_add_component2(bc_url.data, bc_relative.data,
+ pool);
SVN_ERR(svn_ra_neon__parsed_request(ras,
"REPORT",
Modified: subversion/trunk/subversion/libsvn_ra_neon/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/props.c?rev=1054721&r1=1054720&r2=1054721&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/props.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/props.c Mon Jan 3 19:43:33 2011
@@ -1017,9 +1017,9 @@ svn_error_t *svn_ra_neon__get_baseline_i
if (is_dir != NULL)
{
/* query the DAV:resourcetype of the full, assembled URL. */
- const char *full_bc_url = svn_path_url_add_component(my_bc_url->data,
- my_bc_rel.data,
- pool);
+ const char *full_bc_url = svn_path_url_add_component2(my_bc_url->data,
+ my_bc_rel.data,
+ pool);
SVN_ERR(svn_ra_neon__get_starting_props(&rsrc, sess, full_bc_url,
NULL, pool));
*is_dir = rsrc->is_collection;
@@ -1280,7 +1280,7 @@ svn_ra_neon__do_check_path(svn_ra_sessio
/* If we were given a relative path to append, append it. */
if (path)
- url = svn_path_url_add_component(url, path, pool);
+ url = svn_path_url_add_component2(url, path, pool);
err = svn_ra_neon__get_baseline_info(&is_dir, NULL, NULL, NULL,
ras, url, revision, pool);
@@ -1320,7 +1320,7 @@ svn_ra_neon__do_stat(svn_ra_session_t *s
/* If we were given a relative path to append, append it. */
if (path)
- url = svn_path_url_add_component(url, path, pool);
+ url = svn_path_url_add_component2(url, path, pool);
/* Invalid revision means HEAD, which is just the public URL. */
if (! SVN_IS_VALID_REVNUM(revision))
@@ -1348,8 +1348,8 @@ svn_ra_neon__do_stat(svn_ra_session_t *s
return err;
}
- final_url = svn_path_url_add_component(bc_url.data, bc_relative.data,
- pool);
+ final_url = svn_path_url_add_component2(bc_url.data, bc_relative.data,
+ pool);
}
/* Depth-zero PROPFIND is the One True DAV Way. */