Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 578E74BC6 for ; Tue, 17 May 2011 23:07:04 +0000 (UTC) Received: (qmail 97443 invoked by uid 500); 17 May 2011 23:07:04 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 97390 invoked by uid 500); 17 May 2011 23:07:04 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 97383 invoked by uid 99); 17 May 2011 23:07:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 May 2011 23:07:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 May 2011 23:06:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 143DA2388A60; Tue, 17 May 2011 23:06:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1104620 - in /subversion/trunk/subversion/libsvn_ra_neon: commit.c fetch.c file_revs.c get_deleted_rev.c get_location_segments.c get_locations.c lock.c log.c mergeinfo.c props.c ra_neon.h session.c Date: Tue, 17 May 2011 23:06:37 -0000 To: commits@subversion.apache.org From: ivan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110517230638.143DA2388A60@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ivan Date: Tue May 17 23:06:37 2011 New Revision: 1104620 URL: http://svn.apache.org/viewvc?rev=1104620&view=rev Log: Simplify ra_neon code a bit. * subversion/libsvn_ra_neon/props.c * subversion/libsvn_ra_neon/ra_neon.h (svn_ra_neon__get_baseline_info): Return regular NULL terminated string, instead of svn_string_t. (svn_ra_neon__do_check_path, svn_ra_neon__do_stat): Update callers. * subversion/libsvn_ra_neon/session.c * subversion/libsvn_ra_neon/commit.c * subversion/libsvn_ra_neon/fetch.c * subversion/libsvn_ra_neon/file_revs.c * subversion/libsvn_ra_neon/get_deleted_rev.c * subversion/libsvn_ra_neon/get_location_segments.c * subversion/libsvn_ra_neon/get_locations.c * subversion/libsvn_ra_neon/lock.c * subversion/libsvn_ra_neon/log.c * subversion/libsvn_ra_neon/mergeinfo.c (get_version_url, copy_resource, svn_ra_neon__get_file, svn_ra_neon__get_dir, reporter_link_path, svn_ra_neon__get_file_revs, svn_ra_neon__get_deleted_rev, svn_ra_neon__get_location_segments, svn_ra_neon__get_locations, do_lock, svn_ra_neon__get_lock_internal, svn_ra_neon__get_log, svn_ra_neon__get_mergeinfo, svn_ra_neon__get_repos_root): Update callers. Modified: subversion/trunk/subversion/libsvn_ra_neon/commit.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_deleted_rev.c subversion/trunk/subversion/libsvn_ra_neon/get_location_segments.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 subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h subversion/trunk/subversion/libsvn_ra_neon/session.c Modified: subversion/trunk/subversion/libsvn_ra_neon/commit.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/commit.c?rev=1104620&r1=1104619&r2=1104620&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_ra_neon/commit.c (original) +++ subversion/trunk/subversion/libsvn_ra_neon/commit.c Tue May 17 23:06:37 2011 @@ -224,14 +224,14 @@ static svn_error_t * get_version_url(com } else { - svn_string_t bc_url; - svn_string_t bc_relative; + const char *bc_url; + const char *bc_relative; /* The version URL comes from a resource in the Baseline Collection. */ SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL, cc->ras, rsrc->url, rsrc->revision, pool)); - url = svn_path_url_add_component2(bc_url.data, bc_relative.data, pool); + url = svn_path_url_add_component2(bc_url, bc_relative, pool); } /* Get the DAV:checked-in property, which contains the URL of the @@ -571,14 +571,14 @@ static svn_error_t * copy_resource(svn_r const char *copy_dst_url, apr_pool_t *scratch_pool) { - svn_string_t bc_url, bc_relative; + const char *bc_url; + const char *bc_relative; const char *copy_src_url; SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL, ras, copyfrom_path, copyfrom_revision, scratch_pool)); - copy_src_url = svn_path_url_add_component2(bc_url.data, - bc_relative.data, + copy_src_url = svn_path_url_add_component2(bc_url, bc_relative, scratch_pool); SVN_ERR(svn_ra_neon__copy(ras, 1 /* overwrite */, SVN_RA_NEON__DEPTH_INFINITE, copy_src_url, copy_dst_url, scratch_pool)); Modified: subversion/trunk/subversion/libsvn_ra_neon/fetch.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/fetch.c?rev=1104620&r1=1104619&r2=1104620&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_ra_neon/fetch.c (original) +++ subversion/trunk/subversion/libsvn_ra_neon/fetch.c Tue May 17 23:06:37 2011 @@ -682,12 +682,12 @@ svn_error_t *svn_ra_neon__get_file(svn_r else { svn_revnum_t got_rev; - svn_string_t bc_url, bc_relative; + const char *bc_url; + const char *bc_relative; SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, &got_rev, ras, url, revision, pool)); - final_url = svn_path_url_add_component2(bc_url.data, bc_relative.data, - pool); + final_url = svn_path_url_add_component2(bc_url, bc_relative, pool); if (fetched_rev != NULL) *fetched_rev = got_rev; } @@ -811,12 +811,12 @@ svn_error_t *svn_ra_neon__get_dir(svn_ra else { svn_revnum_t got_rev; - svn_string_t bc_url, bc_relative; + const char *bc_url; + const char *bc_relative; SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, &got_rev, ras, url, revision, pool)); - final_url = svn_path_url_add_component2(bc_url.data, bc_relative.data, - pool); + final_url = svn_path_url_add_component2(bc_url, bc_relative, pool); if (fetched_rev != NULL) *fetched_rev = got_rev; } @@ -2296,7 +2296,7 @@ static svn_error_t * reporter_link_path( report_baton_t *rb = report_baton; const char *entry; svn_stringbuf_t *qpath = NULL, *qlinkpath = NULL; - svn_string_t bc_relative; + const char *bc_relative; const char *tokenstring = ""; const char *depthstring = apr_psprintf(pool, "depth=\"%s\"", svn_depth_to_word(depth)); @@ -2318,7 +2318,7 @@ static svn_error_t * reporter_link_path( svn_xml_escape_cdata_cstring(&qpath, path, pool); - svn_xml_escape_attr_cstring(&qlinkpath, bc_relative.data, pool); + svn_xml_escape_attr_cstring(&qlinkpath, bc_relative, pool); if (start_empty) entry = apr_psprintf(pool, "priv; svn_stringbuf_t *request_body = svn_stringbuf_create("", pool); - svn_string_t bc_url, bc_relative; + const char *bc_url; + const char *bc_relative; const char *final_bc_url; int http_status = 0; struct report_baton rb; @@ -358,8 +359,7 @@ svn_ra_neon__get_file_revs(svn_ra_sessio baseline-collection URL, which we get from END. */ SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL, ras, ras->url->data, end, pool)); - final_bc_url = svn_path_url_add_component2(bc_url.data, bc_relative.data, - pool); + final_bc_url = svn_path_url_add_component2(bc_url, bc_relative, pool); /* Dispatch the request. */ err = svn_ra_neon__parsed_request(ras, "REPORT", final_bc_url, Modified: subversion/trunk/subversion/libsvn_ra_neon/get_deleted_rev.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/get_deleted_rev.c?rev=1104620&r1=1104619&r2=1104620&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_ra_neon/get_deleted_rev.c (original) +++ subversion/trunk/subversion/libsvn_ra_neon/get_deleted_rev.c Tue May 17 23:06:37 2011 @@ -120,7 +120,8 @@ svn_ra_neon__get_deleted_rev(svn_ra_sess { svn_ra_neon__session_t *ras = session->priv; const char *body, *final_bc_url; - svn_string_t bc_url, bc_relative; + const char *bc_url; + const char *bc_relative; int status_code; svn_error_t *err; drev_baton_t *b = apr_palloc(pool, sizeof(*b)); @@ -135,8 +136,7 @@ svn_ra_neon__get_deleted_rev(svn_ra_sess baseline-collection URL, which we get from the peg revision. */ SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL, ras, ras->url->data, peg_revision, pool)); - final_bc_url = svn_path_url_add_component2(bc_url.data, bc_relative.data, - pool); + final_bc_url = svn_path_url_add_component2(bc_url, bc_relative, pool); body = apr_psprintf(pool, "" Modified: subversion/trunk/subversion/libsvn_ra_neon/get_location_segments.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/get_location_segments.c?rev=1104620&r1=1104619&r2=1104620&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_ra_neon/get_location_segments.c (original) +++ subversion/trunk/subversion/libsvn_ra_neon/get_location_segments.c Tue May 17 23:06:37 2011 @@ -143,7 +143,8 @@ svn_ra_neon__get_location_segments(svn_r svn_stringbuf_t *request_body; svn_error_t *err; get_location_segments_baton_t request_baton; - svn_string_t bc_url, bc_relative; + const char *bc_url; + const char *bc_relative; const char *bc; int status_code = 0; apr_pool_t *subpool = svn_pool_create(pool); @@ -194,7 +195,7 @@ svn_ra_neon__get_location_segments(svn_r SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL, ras, ras->url->data, peg_revision, subpool)); - bc = svn_path_url_add_component2(bc_url.data, bc_relative.data, subpool); + bc = svn_path_url_add_component2(bc_url, bc_relative, subpool); err = svn_ra_neon__parsed_request(ras, "REPORT", bc, request_body->data, NULL, NULL, 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=1104620&r1=1104619&r2=1104620&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_ra_neon/get_locations.c (original) +++ subversion/trunk/subversion/libsvn_ra_neon/get_locations.c Tue May 17 23:06:37 2011 @@ -130,7 +130,8 @@ svn_ra_neon__get_locations(svn_ra_sessio svn_error_t *err; get_locations_baton_t request_baton; const char *relative_path_quoted; - svn_string_t bc_url, bc_relative; + const char *bc_url; + const char *bc_relative; const char *final_bc_url; int i; int status_code = 0; @@ -176,8 +177,7 @@ svn_ra_neon__get_locations(svn_ra_sessio baseline-collection URL, which we get from the peg revision. */ SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL, ras, ras->url->data, peg_revision, pool)); - final_bc_url = svn_path_url_add_component2(bc_url.data, bc_relative.data, - pool); + final_bc_url = svn_path_url_add_component2(bc_url, bc_relative, 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=1104620&r1=1104619&r2=1104620&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_ra_neon/lock.c (original) +++ subversion/trunk/subversion/libsvn_ra_neon/lock.c Tue May 17 23:06:37 2011 @@ -242,7 +242,7 @@ do_lock(svn_lock_t **lock, ne_uri uri; int code; const char *url; - svn_string_t fs_path; + const char *fs_path; ne_xml_parser *lck_parser; svn_ra_neon__session_t *ras = session->priv; lock_baton_t *lrb = apr_pcalloc(pool, sizeof(*lrb)); @@ -309,7 +309,7 @@ do_lock(svn_lock_t **lock, /*###FIXME: we never verified whether we have received back the type of lock we requested: was it shared/exclusive? was it write/otherwise? How many did we get back? Only one? */ - err = lock_from_baton(lock, req, fs_path.data, lrb, pool); + err = lock_from_baton(lock, req, fs_path, lrb, pool); cleanup: /* 405 == Method Not Allowed (Occurs when trying to lock a working @@ -541,7 +541,7 @@ svn_ra_neon__get_lock_internal(svn_ra_ne apr_pool_t *pool) { const char *url; - svn_string_t fs_path; + const char *fs_path; svn_error_t *err; ne_uri uri; lock_baton_t *lrb = apr_pcalloc(pool, sizeof(*lrb)); @@ -593,7 +593,7 @@ svn_ra_neon__get_lock_internal(svn_ra_ne /*###FIXME We assume here we only got one lock response. The WebDAV spec makes no such guarantees. How to make sure we grab the one we need? */ - err = lock_from_baton(lock, req, fs_path.data, lrb, pool); + err = lock_from_baton(lock, req, fs_path, lrb, pool); cleanup: svn_ra_neon__request_destroy(req); Modified: subversion/trunk/subversion/libsvn_ra_neon/log.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/log.c?rev=1104620&r1=1104619&r2=1104620&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_ra_neon/log.c (original) +++ subversion/trunk/subversion/libsvn_ra_neon/log.c Tue May 17 23:06:37 2011 @@ -368,7 +368,8 @@ svn_error_t * svn_ra_neon__get_log(svn_r svn_stringbuf_t *request_body = svn_stringbuf_create("", pool); svn_boolean_t want_custom_revprops; struct log_baton lb; - svn_string_t bc_url, bc_relative; + const char *bc_url; + const char *bc_relative; const char *final_bc_url; svn_revnum_t use_rev; svn_error_t *err; @@ -503,8 +504,7 @@ svn_error_t * svn_ra_neon__get_log(svn_r use_rev = (start > end) ? start : end; SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL, ras, ras->url->data, use_rev, pool)); - final_bc_url = svn_path_url_add_component2(bc_url.data, bc_relative.data, - pool); + final_bc_url = svn_path_url_add_component2(bc_url, bc_relative, 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=1104620&r1=1104619&r2=1104620&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_ra_neon/mergeinfo.c (original) +++ subversion/trunk/subversion/libsvn_ra_neon/mergeinfo.c Tue May 17 23:06:37 2011 @@ -177,7 +177,8 @@ svn_ra_neon__get_mergeinfo(svn_ra_sessio svn_ra_neon__session_t *ras = session->priv; svn_stringbuf_t *request_body = svn_stringbuf_create("", pool); struct mergeinfo_baton mb; - svn_string_t bc_url, bc_relative; + const char *bc_url; + const char *bc_relative; const char *final_bc_url; static const char minfo_report_head[] = @@ -248,8 +249,7 @@ svn_ra_neon__get_mergeinfo(svn_ra_sessio baseline-collection URL, which we get from END. */ SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL, ras, ras->url->data, revision, pool)); - final_bc_url = svn_path_url_add_component2(bc_url.data, bc_relative.data, - pool); + final_bc_url = svn_path_url_add_component2(bc_url, bc_relative, 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=1104620&r1=1104619&r2=1104620&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_ra_neon/props.c (original) +++ subversion/trunk/subversion/libsvn_ra_neon/props.c Tue May 17 23:06:37 2011 @@ -957,8 +957,8 @@ svn_error_t *svn_ra_neon__get_baseline_p } -svn_error_t *svn_ra_neon__get_baseline_info(svn_string_t *bc_url, - svn_string_t *bc_relative, +svn_error_t *svn_ra_neon__get_baseline_info(const char **bc_url_p, + const char **bc_relative_p, svn_revnum_t *latest_rev, svn_ra_neon__session_t *sess, const char *url, @@ -986,19 +986,17 @@ svn_error_t *svn_ra_neon__get_baseline_i "the youngest revision")); revision = youngest; } - if (bc_url) + if (bc_url_p) { - bc_url->data = apr_psprintf(pool, "%s/%ld", sess->rev_root_stub, - revision); - bc_url->len = strlen(bc_url->data); + *bc_url_p = apr_psprintf(pool, "%s/%ld", sess->rev_root_stub, + revision); } - if (bc_relative) + if (bc_relative_p) { const char *relpath = svn_uri_is_child(sess->repos_root, url, pool); if (! relpath) relpath = ""; - bc_relative->data = relpath; - bc_relative->len = strlen(relpath); + *bc_relative_p = relpath; } if (latest_rev) { @@ -1036,8 +1034,8 @@ svn_error_t *svn_ra_neon__get_baseline_i } /* maybe return bc_url to the caller */ - if (bc_url) - *bc_url = *my_bc_url; + if (bc_url_p) + *bc_url_p = my_bc_url->data; if (latest_rev != NULL) { @@ -1057,8 +1055,8 @@ svn_error_t *svn_ra_neon__get_baseline_i *latest_rev = SVN_STR_TO_REV(vsn_name->data); } - if (bc_relative) - *bc_relative = my_bc_rel; + if (bc_relative_p) + *bc_relative_p = my_bc_rel.data; return SVN_NO_ERROR; } @@ -1279,7 +1277,8 @@ svn_ra_neon__do_check_path(svn_ra_sessio { svn_ra_neon__session_t *ras = session->priv; const char *url = ras->url->data; - svn_string_t bc_url, bc_relative; + const char *bc_url; + const char *bc_relative; svn_error_t *err; svn_boolean_t is_dir; @@ -1321,8 +1320,8 @@ svn_ra_neon__do_check_path(svn_ra_sessio if (! err) { svn_ra_neon__resource_t *rsrc; - const char *full_bc_url = svn_path_url_add_component2(bc_url.data, - bc_relative.data, + const char *full_bc_url = svn_path_url_add_component2(bc_url, + bc_relative, pool); /* query the DAV:resourcetype of the full, assembled URL. */ @@ -1377,7 +1376,8 @@ svn_ra_neon__do_stat(svn_ra_session_t *s else { /* Else, convert (rev, path) into an opaque server-generated URL. */ - svn_string_t bc_url, bc_relative; + const char *bc_url; + const char *bc_relative; err = svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL, ras, url, revision, pool); @@ -1394,8 +1394,7 @@ svn_ra_neon__do_stat(svn_ra_session_t *s return err; } - final_url = svn_path_url_add_component2(bc_url.data, bc_relative.data, - pool); + final_url = svn_path_url_add_component2(bc_url, bc_relative, pool); } /* Depth-zero PROPFIND is the One True DAV Way. */ 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=1104620&r1=1104619&r2=1104620&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h (original) +++ subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h Tue May 17 23:06:37 2011 @@ -518,10 +518,10 @@ svn_error_t * svn_ra_neon__get_one_prop( should work against the latest (HEAD) revision, or whether it should return information about that specific revision. - If BC_URL is not NULL, then it will be filled in with the URL for + If BC_URL_P is not NULL, then it will be filled in with the URL for the Baseline Collection for the specified revision, or the HEAD. - If BC_RELATIVE is not NULL, then it will be filled in with a + If BC_RELATIVE_P is not NULL, then it will be filled in with a relative pathname for the baselined resource corresponding to the revision of the resource specified by URL. @@ -530,15 +530,15 @@ svn_error_t * svn_ra_neon__get_one_prop( as the REVISION parameter, unless we are working against the HEAD. In that case, the HEAD revision number is returned. - Allocation for BC_URL->data, BC_RELATIVE->data, and temporary data, + Allocation for *BC_URL_P, *BC_RELATIVE_P, and temporary data, will occur in POOL. Note: a Baseline Collection is a complete tree for a specified Baseline. DeltaV baselines correspond one-to-one to Subversion revisions. Thus, the entire state of a revision can be found in a Baseline Collection. */ -svn_error_t *svn_ra_neon__get_baseline_info(svn_string_t *bc_url, - svn_string_t *bc_relative, +svn_error_t *svn_ra_neon__get_baseline_info(const char **bc_url_p, + const char **bc_relative_p, svn_revnum_t *latest_rev, svn_ra_neon__session_t *sess, const char *url, Modified: subversion/trunk/subversion/libsvn_ra_neon/session.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/session.c?rev=1104620&r1=1104619&r2=1104620&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_ra_neon/session.c (original) +++ subversion/trunk/subversion/libsvn_ra_neon/session.c Tue May 17 23:06:37 2011 @@ -1113,7 +1113,7 @@ static svn_error_t *svn_ra_neon__get_rep if (! ras->repos_root) { - svn_string_t bc_relative; + const char *bc_relative; svn_stringbuf_t *url_buf; SVN_ERR(svn_ra_neon__get_baseline_info(NULL, &bc_relative, NULL, @@ -1124,7 +1124,7 @@ static svn_error_t *svn_ra_neon__get_rep in bc_relative. */ url_buf = svn_stringbuf_dup(ras->url, pool); svn_path_remove_components - (url_buf, svn_path_component_count(bc_relative.data)); + (url_buf, svn_path_component_count(bc_relative)); ras->repos_root = apr_pstrdup(ras->pool, url_buf->data); }