You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2011/05/20 13:23:42 UTC
svn commit: r1125328 - in /subversion/trunk/subversion/libsvn_ra_neon:
commit.c props.c ra_neon.h
Author: ivan
Date: Fri May 20 11:23:42 2011
New Revision: 1125328
URL: http://svn.apache.org/viewvc?rev=1125328&view=rev
Log:
* subversion/libsvn_ra_neon/ra_neon.h
* subversion/libsvn_ra_neon/props.c
(svn_ra_neon__get_starting_props): Remove unused label argument. Since all
callers provide NULL now.
(svn_ra_neon__search_for_starting_props, svn_ra_neon__do_check_path):
Update callers.
* subversion/libsvn_ra_neon/commit.c
(commit_add_file): Update callers.
Modified:
subversion/trunk/subversion/libsvn_ra_neon/commit.c
subversion/trunk/subversion/libsvn_ra_neon/props.c
subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h
Modified: subversion/trunk/subversion/libsvn_ra_neon/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/commit.c?rev=1125328&r1=1125327&r2=1125328&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/commit.c Fri May 20 11:23:42 2011
@@ -1185,9 +1185,9 @@ static svn_error_t * commit_add_file(con
public_url = svn_path_url_add_component2(file->cc->ras->url->data,
path, workpool);
err1 = svn_ra_neon__get_starting_props(&res, file->cc->ras,
- put_target, NULL, workpool);
+ put_target, workpool);
err2 = svn_ra_neon__get_starting_props(&res, file->cc->ras,
- public_url, NULL, workpool);
+ public_url, workpool);
if (! err1 && ! err2)
{
/* If the PROPFINDs succeed the file already exists */
Modified: subversion/trunk/subversion/libsvn_ra_neon/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/props.c?rev=1125328&r1=1125327&r2=1125328&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/props.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/props.c Fri May 20 11:23:42 2011
@@ -646,12 +646,11 @@ svn_error_t * svn_ra_neon__get_one_prop(
svn_error_t * svn_ra_neon__get_starting_props(svn_ra_neon__resource_t **rsrc,
svn_ra_neon__session_t *sess,
const char *url,
- const char *label,
apr_pool_t *pool)
{
svn_string_t *propval;
- SVN_ERR(svn_ra_neon__get_props_resource(rsrc, sess, url, label,
+ SVN_ERR(svn_ra_neon__get_props_resource(rsrc, sess, url, NULL,
starting_props, pool));
/* Cache some of the resource information. */
@@ -738,7 +737,7 @@ svn_ra_neon__search_for_starting_props(s
{
svn_pool_clear(iterpool);
err = svn_ra_neon__get_starting_props(rsrc, sess, path_s->data,
- NULL, iterpool);
+ iterpool);
if (! err)
break; /* found an existing, readable parent! */
@@ -1346,8 +1345,7 @@ svn_ra_neon__do_check_path(svn_ra_sessio
pool);
/* query the DAV:resourcetype of the full, assembled URL. */
- err = svn_ra_neon__get_starting_props(&rsrc, ras, full_bc_url,
- NULL, pool);
+ err = svn_ra_neon__get_starting_props(&rsrc, ras, full_bc_url, pool);
if (! err)
is_dir = rsrc->is_collection;
}
Modified: subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h?rev=1125328&r1=1125327&r2=1125328&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h Fri May 20 11:23:42 2011
@@ -483,7 +483,6 @@ svn_error_t * svn_ra_neon__get_props_res
svn_error_t * svn_ra_neon__get_starting_props(svn_ra_neon__resource_t **rsrc,
svn_ra_neon__session_t *sess,
const char *url,
- const char *label,
apr_pool_t *pool);
/* Shared helper func: given a public URL which may not exist in HEAD,