Author: brane
Date: Mon Feb 2 17:03:02 2015
New Revision: 1656518
URL: http://svn.apache.org/r1656518
Log:
On the reuse-ra-session branch: Sync with trunk to r1656516, propagate the
rename from that revision and similarly rename another quasi-public struct.
And quote Emerson on foolish consistencies.
* subversion/libsvn_client/client.h
(svn_client__ra_cache_t): Rename from client_ra_cache_t and update all uses.
* subversion/libsvn_client/ra_cache.h,
subversion/libsvn_client/ctx.c,
subversion/libsvn_client/ra.c,
subversion/libsvn_client/ra_cache.c:
Propagate the struct renames to cause some unnecessary code churn.
Modified:
subversion/branches/reuse-ra-session/ (props changed)
subversion/branches/reuse-ra-session/subversion/libsvn_client/client.h
subversion/branches/reuse-ra-session/subversion/libsvn_client/ctx.c
subversion/branches/reuse-ra-session/subversion/libsvn_client/ra.c
subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.c
subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.h
Propchange: subversion/branches/reuse-ra-session/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 2 17:03:02 2015
@@ -86,4 +86,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1501802-1656489
+/subversion/trunk:1501802-1656516
Modified: subversion/branches/reuse-ra-session/subversion/libsvn_client/client.h
URL:
http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/libsvn_client/client.h?rev=1656518&r1=1656517&r2=1656518&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/libsvn_client/client.h
(original)
+++ subversion/branches/reuse-ra-session/subversion/libsvn_client/client.h Mon
Feb 2 17:03:02 2015
@@ -47,7 +47,7 @@ extern "C" {
/* RA session cache */
-typedef struct client_ra_cache_t
+typedef struct svn_client__ra_cache_t
{
/* Hashtable of cached RA sessions. Keys are RA_SESSION_T and values
* are CLIENT_RA_SESION_T pointers. */
@@ -57,14 +57,14 @@ typedef struct client_ra_cache_t
/* Next ID for RA sessions. Used only for diagnostics purpose. */
int next_id;
-} client_ra_cache_t;
+} svn_client__ra_cache_t;
/* Private client context.
*
* This is what is actually allocated by svn_client_create_context2(),
* which then returns the address of the public_ctx member. */
-typedef struct client_ctx_t
+typedef struct svn_client__private_ctx_t
{
/* Reserved field, always zero, to detect misuse of the private
context as a public client context. */
@@ -78,16 +78,16 @@ typedef struct client_ctx_t
apr_off_t total_progress;
/* The RA session cache. */
- client_ra_cache_t ra_cache;
+ svn_client__ra_cache_t ra_cache;
/* The public context. */
svn_client_ctx_t public_ctx;
-} client_ctx_t;
+} svn_client__private_ctx_t;
/* Given a public client context CTX, return the private context
within which it is allocated. */
-client_ctx_t *
+svn_client__private_ctx_t *
svn_client__get_private_ctx(svn_client_ctx_t *ctx);
Modified: subversion/branches/reuse-ra-session/subversion/libsvn_client/ctx.c
URL:
http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/libsvn_client/ctx.c?rev=1656518&r1=1656517&r2=1656518&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/libsvn_client/ctx.c
(original)
+++ subversion/branches/reuse-ra-session/subversion/libsvn_client/ctx.c Mon Feb
2 17:03:02 2015
@@ -82,11 +82,11 @@ call_conflict_func(svn_wc_conflict_resul
/* The magic number in client_ctx_t.magic_id. */
#define CLIENT_CTX_MAGIC APR_UINT64_C(0xDEADBEEF600DF00D)
-client_ctx_t *
+svn_client__private_ctx_t *
svn_client__get_private_ctx(svn_client_ctx_t *ctx)
{
- client_ctx_t *const private_ctx =
- (void*)((char *)ctx - offsetof(client_ctx_t, public_ctx));
+ svn_client__private_ctx_t *const private_ctx =
+ (void*)((char *)ctx - offsetof(svn_client__private_ctx_t, public_ctx));
SVN_ERR_ASSERT_NO_RETURN(&private_ctx->public_ctx == ctx);
SVN_ERR_ASSERT_NO_RETURN(0 == private_ctx->magic_null);
SVN_ERR_ASSERT_NO_RETURN(CLIENT_CTX_MAGIC == private_ctx->magic_id);
@@ -100,7 +100,8 @@ svn_client_create_context2(svn_client_ct
{
svn_config_t *cfg_config;
- client_ctx_t *const private_ctx = apr_pcalloc(pool, sizeof(*private_ctx));
+ svn_client__private_ctx_t *const private_ctx =
+ apr_pcalloc(pool, sizeof(*private_ctx));
svn_client_ctx_t *const public_ctx = &private_ctx->public_ctx;
private_ctx->magic_null = 0;
Modified: subversion/branches/reuse-ra-session/subversion/libsvn_client/ra.c
URL:
http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/libsvn_client/ra.c?rev=1656518&r1=1656517&r2=1656518&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/libsvn_client/ra.c
(original)
+++ subversion/branches/reuse-ra-session/subversion/libsvn_client/ra.c Mon Feb
2 17:03:02 2015
@@ -301,7 +301,8 @@ progress_func(apr_off_t progress,
{
callback_baton_t *b = baton;
svn_client_ctx_t *public_ctx = b->ctx;
- client_ctx_t *private_ctx = svn_client__get_private_ctx(public_ctx);
+ svn_client__private_ctx_t *private_ctx =
+ svn_client__get_private_ctx(public_ctx);
private_ctx->total_progress += (progress - b->last_progress);
b->last_progress = progress;
Modified:
subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.c
URL:
http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.c?rev=1656518&r1=1656517&r2=1656518&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.c
(original)
+++ subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.c
Mon Feb 2 17:03:02 2015
@@ -79,15 +79,16 @@ cleanup_session(void *data)
/* Convert a public client context pointer to a private client context
pointer. */
-static client_ra_cache_t *
+static svn_client__ra_cache_t *
get_private_ra_cache(svn_client_ctx_t *public_ctx)
{
- client_ctx_t *const private_ctx = svn_client__get_private_ctx(public_ctx);
+ svn_client__private_ctx_t *const private_ctx =
+ svn_client__get_private_ctx(public_ctx);
return &private_ctx->ra_cache;
}
void
-svn_client__ra_cache_init(client_ctx_t *private_ctx,
+svn_client__ra_cache_init(svn_client__private_ctx_t *private_ctx,
apr_hash_t *config,
apr_pool_t *pool)
{
@@ -262,7 +263,7 @@ progress_func(apr_off_t progress,
static svn_error_t *
find_session_by_url(client_ra_session_t **cache_entry_p,
- client_ra_cache_t *ra_cache,
+ svn_client__ra_cache_t *ra_cache,
const char *url,
apr_pool_t *scratch_pool)
{
@@ -296,7 +297,7 @@ svn_client__ra_cache_open_session(svn_ra
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- client_ra_cache_t *const ra_cache = get_private_ra_cache(ctx);
+ svn_client__ra_cache_t *const ra_cache = get_private_ra_cache(ctx);
client_ra_session_t *cache_entry;
if (corrected_p)
@@ -404,7 +405,7 @@ void
svn_client__ra_cache_release_session(svn_client_ctx_t *ctx,
svn_ra_session_t *session)
{
- client_ra_cache_t *const ra_cache = get_private_ra_cache(ctx);
+ svn_client__ra_cache_t *const ra_cache = get_private_ra_cache(ctx);
client_ra_session_t *cache_entry = apr_hash_get(ra_cache->cached_session,
&session, sizeof(session));
Modified:
subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.h
URL:
http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.h?rev=1656518&r1=1656517&r2=1656518&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.h
(original)
+++ subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.h
Mon Feb 2 17:03:02 2015
@@ -38,11 +38,11 @@ extern "C" {
#endif /* __cplusplus */
-/* Initializes the CTX->ra_cache structure. Will use CONFIG for for RA
- sessions created in this context. Assumes that CTX was allocated
- from POOL. */
+/* Initializes the PRIVATE_CTX->ra_cache structure. Will use CONFIG
+ for for RA sessions created in this context. Assumes that CTX was
+ allocated from POOL. */
void
-svn_client__ra_cache_init(client_ctx_t *private_ctx,
+svn_client__ra_cache_init(svn_client__private_ctx_t *private_ctx,
apr_hash_t *config,
apr_pool_t *pool);
