subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1656516 - in /subversion/trunk/subversion/libsvn_client: client.h ctx.c ra.c
Date Mon, 02 Feb 2015 16:45:08 GMT
Author: brane
Date: Mon Feb  2 16:45:08 2015
New Revision: 1656516

URL: http://svn.apache.org/r1656516
Log:
Rename a library-private struct to soothe the more pedantic types.

* subversion/libsvn_client/client.h,
  subversion/libsvn_client/ctx.c,
  subversion/libsvn_client/ra.c
  (svn_client__private_ctx_t): Renamed from client_ctx_t.

Modified:
    subversion/trunk/subversion/libsvn_client/client.h
    subversion/trunk/subversion/libsvn_client/ctx.c
    subversion/trunk/subversion/libsvn_client/ra.c

Modified: subversion/trunk/subversion/libsvn_client/client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/client.h?rev=1656516&r1=1656515&r2=1656516&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/client.h (original)
+++ subversion/trunk/subversion/libsvn_client/client.h Mon Feb  2 16:45:08 2015
@@ -50,7 +50,7 @@ extern "C" {
  *
  * 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. */
@@ -65,12 +65,12 @@ typedef struct client_ctx_t
 
   /* 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/trunk/subversion/libsvn_client/ctx.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/ctx.c?rev=1656516&r1=1656515&r2=1656516&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/ctx.c (original)
+++ subversion/trunk/subversion/libsvn_client/ctx.c Mon Feb  2 16:45:08 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/trunk/subversion/libsvn_client/ra.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/ra.c?rev=1656516&r1=1656515&r2=1656516&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/ra.c (original)
+++ subversion/trunk/subversion/libsvn_client/ra.c Mon Feb  2 16:45:08 2015
@@ -300,7 +300,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;



Mime
View raw message