You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/01/25 20:48:34 UTC
svn commit: r1654696 - in /subversion/trunk/subversion/libsvn_ra_serf:
blncache.c blncache.h commit.c property.c ra_serf.h
Author: rhuijben
Date: Sun Jan 25 19:48:34 2015
New Revision: 1654696
URL: http://svn.apache.org/r1654696
Log:
Make a function static and rename some pool arguments to document their
behaviour.
* subversion/libsvn_ra_serf/blncache.c
(svn_ra_serf__blncache_set): Rename argument to scratch_pool.
(svn_ra_serf__blncache_get_bc_url): Rename argument to result_pool.
* subversion/libsvn_ra_serf/blncache.h
(svn_ra_serf__blncache_set): Rename argument to scratch_pool.
(svn_ra_serf__blncache_get_bc_url): Rename argument to result_pool.
* subversion/libsvn_ra_serf/commit.c
(open_root): Use scratch_pool for request.
* subversion/libsvn_ra_serf/property.c
(svn_ra_serf__deliver_node_props): Rename to...
(deliver_node_props):... this.
(svn_ra_serf__fetch_node_props): Update caller.
(get_baseline_info): Split pool argument.
* subversion/libsvn_ra_serf/ra_serf.h
(svn_ra_serf__deliver_node_props): Remove function.
Modified:
subversion/trunk/subversion/libsvn_ra_serf/blncache.c
subversion/trunk/subversion/libsvn_ra_serf/blncache.h
subversion/trunk/subversion/libsvn_ra_serf/commit.c
subversion/trunk/subversion/libsvn_ra_serf/property.c
subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
Modified: subversion/trunk/subversion/libsvn_ra_serf/blncache.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/blncache.c?rev=1654696&r1=1654695&r2=1654696&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/blncache.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/blncache.c Sun Jan 25 19:48:34 2015
@@ -112,7 +112,7 @@ svn_ra_serf__blncache_set(svn_ra_serf__b
const char *baseline_url,
svn_revnum_t revision,
const char *bc_url,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
if (bc_url && SVN_IS_VALID_REVNUM(revision))
{
@@ -147,11 +147,11 @@ svn_error_t *
svn_ra_serf__blncache_get_bc_url(const char **bc_url_p,
svn_ra_serf__blncache_t *blncache,
svn_revnum_t revnum,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
const char *value = apr_hash_get(blncache->revnum_to_bc,
&revnum, sizeof(revnum));
- *bc_url_p = value ? apr_pstrdup(pool, value) : NULL;
+ *bc_url_p = value ? apr_pstrdup(result_pool, value) : NULL;
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_ra_serf/blncache.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/blncache.h?rev=1654696&r1=1654695&r2=1654696&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/blncache.h (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/blncache.h Sun Jan 25 19:48:34 2015
@@ -59,7 +59,7 @@ svn_ra_serf__blncache_set(svn_ra_serf__b
const char *baseline_url,
svn_revnum_t revnum,
const char *bc_url,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
/* Sets *BC_URL_P with a pointer to baseline collection URL for the given
* REVNUM. *BC_URL_P will be NULL if cache doesn't have information about
@@ -69,7 +69,7 @@ svn_error_t *
svn_ra_serf__blncache_get_bc_url(const char **bc_url_p,
svn_ra_serf__blncache_t *blncache,
svn_revnum_t revnum,
- apr_pool_t *pool);
+ apr_pool_t *result_pool);
/* Sets *BC_URL_P with pointer to baseline collection URL and *REVISION_P
* with revision number of baseline BASELINE_URL. *BC_URL_P will be NULL,
Modified: subversion/trunk/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/commit.c?rev=1654696&r1=1654695&r2=1654696&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/commit.c Sun Jan 25 19:48:34 2015
@@ -1343,7 +1343,7 @@ open_root(void *edit_baton,
/* Now go fetch our VCC and baseline so we can do a CHECKOUT. */
SVN_ERR(svn_ra_serf__discover_vcc(&(commit_ctx->vcc_url),
- commit_ctx->session, commit_ctx->pool));
+ commit_ctx->session, scratch_pool));
/* Build our directory baton. */
Modified: subversion/trunk/subversion/libsvn_ra_serf/property.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/property.c?rev=1654696&r1=1654695&r2=1654696&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/property.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/property.c Sun Jan 25 19:48:34 2015
@@ -523,13 +523,13 @@ svn_ra_serf__deliver_svn_props(void *bat
return SVN_NO_ERROR;
}
-svn_error_t *
-svn_ra_serf__deliver_node_props(void *baton,
- const char *path,
- const char *ns,
- const char *name,
- const svn_string_t *value,
- apr_pool_t *scratch_pool)
+static svn_error_t *
+deliver_node_props(void *baton,
+ const char *path,
+ const char *ns,
+ const char *name,
+ const svn_string_t *value,
+ apr_pool_t *scratch_pool)
{
apr_hash_t *nss = baton;
apr_hash_t *props;
@@ -567,7 +567,7 @@ svn_ra_serf__fetch_node_props(apr_hash_t
SVN_ERR(svn_ra_serf__create_propfind_handler(&handler, session,
url, revision, "0", which_props,
- svn_ra_serf__deliver_node_props,
+ deliver_node_props,
props, scratch_pool));
SVN_ERR(svn_ra_serf__context_run_one(handler, scratch_pool));
@@ -776,7 +776,8 @@ get_baseline_info(const char **bc_url,
svn_revnum_t *revnum_used,
svn_ra_serf__session_t *session,
svn_revnum_t revision,
- apr_pool_t *pool)
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
/* If we detected HTTP v2 support on the server, we can construct
the baseline collection URL ourselves, and fetch the latest
@@ -790,10 +791,10 @@ get_baseline_info(const char **bc_url,
else
{
SVN_ERR(svn_ra_serf__v2_get_youngest_revnum(
- revnum_used, session, pool));
+ revnum_used, session, scratch_pool));
}
- *bc_url = apr_psprintf(pool, "%s/%ld",
+ *bc_url = apr_psprintf(result_pool, "%s/%ld",
session->rev_root_stub, *revnum_used);
}
@@ -802,20 +803,22 @@ get_baseline_info(const char **bc_url,
{
const char *vcc_url;
- SVN_ERR(svn_ra_serf__discover_vcc(&vcc_url, session, pool));
+ SVN_ERR(svn_ra_serf__discover_vcc(&vcc_url, session, scratch_pool));
if (SVN_IS_VALID_REVNUM(revision))
{
/* First check baseline information cache. */
SVN_ERR(svn_ra_serf__blncache_get_bc_url(bc_url,
session->blncache,
- revision, pool));
+ revision, result_pool));
if (!*bc_url)
{
SVN_ERR(retrieve_baseline_info(NULL, bc_url, session,
- vcc_url, revision, pool, pool));
+ vcc_url, revision,
+ result_pool, scratch_pool));
SVN_ERR(svn_ra_serf__blncache_set(session->blncache, NULL,
- revision, *bc_url, pool));
+ revision, *bc_url,
+ scratch_pool));
}
*revnum_used = revision;
@@ -824,7 +827,7 @@ get_baseline_info(const char **bc_url,
{
SVN_ERR(v1_get_youngest_revnum(revnum_used, bc_url,
session, vcc_url,
- pool, pool));
+ result_pool, scratch_pool));
}
}
@@ -850,7 +853,7 @@ svn_ra_serf__get_stable_url(const char *
url = session->session_url.path;
SVN_ERR(get_baseline_info(&basecoll_url, &revnum_used,
- session, revision, scratch_pool));
+ session, revision, scratch_pool, scratch_pool));
SVN_ERR(svn_ra_serf__get_relative_path(&repos_relpath, url,
session, scratch_pool));
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=1654696&r1=1654695&r2=1654696&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h Sun Jan 25 19:48:34 2015
@@ -947,20 +947,6 @@ svn_ra_serf__deliver_svn_props(void *bat
apr_pool_t *scratch_pool);
/*
- * Implementation of svn_ra_serf__prop_func_t that delivers all DAV properties
- * in (const char * -> apr_hash_t *) on Namespace pointing to a second hash
- * (const char * -> svn_string_t *) to the values.
- */
-svn_error_t *
-svn_ra_serf__deliver_node_props(void *baton,
- const char *path,
- const char *ns,
- const char *name,
- const svn_string_t *value,
- apr_pool_t *scratch_pool);
-
-
-/*
* This function will create a handler for a PROPFIND request, which will deliver
* properties to PROP_FUNC() with PROP_BATON for the properties listed in LOOKUP_PROPS
* at URL for DEPTH ("0","1","infinity").