Author: hwright
Date: Thu Apr 12 17:00:53 2012
New Revision: 1325384
URL: http://svn.apache.org/viewvc?rev=1325384&view=rev
Log:
Remove a circular library reference introduced in r1325370: call the ra_serf-
specific function, rather than the libsvn_ra one.
* subversion/libsvn_ra_serf/serf.c
(svn_ra_serf__get_repos_root): Un-static-ify.
* subversion/libsvn_ra_serf/ra_serf.h
(svn_ra_serf__get_repos_root): Add prototype.
* subversion/libsvn_ra_serf/commit.c
(svn_ra_serf__get_commit_editor): Call the library-local version.
Modified:
subversion/trunk/subversion/libsvn_ra_serf/commit.c
subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
subversion/trunk/subversion/libsvn_ra_serf/serf.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/commit.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/commit.c?rev=1325384&r1=1325383&r2=1325384&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/commit.c Thu Apr 12 17:00:53 2012
@@ -2369,7 +2369,7 @@ svn_ra_serf__get_commit_editor(svn_ra_se
*ret_editor = editor;
*edit_baton = ctx;
- SVN_ERR(svn_ra_get_repos_root2(ra_session, &repos_root, pool));
+ SVN_ERR(svn_ra_serf__get_repos_root(ra_session, &repos_root, pool));
SVN_ERR(svn_editor__insert_shims(ret_editor, edit_baton, *ret_editor,
*edit_baton, repos_root, NULL,
Modified: subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h?rev=1325384&r1=1325383&r2=1325384&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h Thu Apr 12 17:00:53
2012
@@ -1425,6 +1425,12 @@ svn_ra_serf__create_sb_bucket(svn_spillb
apr_pool_t *scratch_pool);
+svn_error_t *
+svn_ra_serf__get_repos_root(svn_ra_session_t *ra_session,
+ const char **url,
+ apr_pool_t *pool);
+
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: subversion/trunk/subversion/libsvn_ra_serf/serf.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1325384&r1=1325383&r2=1325384&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Thu Apr 12 17:00:53 2012
@@ -1063,7 +1063,7 @@ svn_ra_serf__get_dir(svn_ra_session_t *r
return SVN_NO_ERROR;
}
-static svn_error_t *
+svn_error_t *
svn_ra_serf__get_repos_root(svn_ra_session_t *ra_session,
const char **url,
apr_pool_t *pool)
