You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gs...@apache.org on 2012/06/21 18:57:26 UTC
svn commit: r1352614 - in /subversion/trunk/subversion:
include/private/svn_client_private.h libsvn_client/switch.c
libsvn_client/update.c libsvn_client/util.c
Author: gstein
Date: Thu Jun 21 16:57:25 2012
New Revision: 1352614
URL: http://svn.apache.org/viewvc?rev=1352614&view=rev
Log:
Narrow the type of a parameter.
* subversion/include/private/svn_client_private.h:
(svn_client__wc_node_get_base): take a WC_CTX rather than CTX.
* subversion/libsvn_client/switch.c:
(switch_internal): track parameter type change
* subversion/libsvn_client/update.c:
(update_internal): track parameter type change
* subversion/libsvn_client/util.c:
(svn_client__wc_node_get_base): adjust parameter type and the code
Modified:
subversion/trunk/subversion/include/private/svn_client_private.h
subversion/trunk/subversion/libsvn_client/switch.c
subversion/trunk/subversion/libsvn_client/update.c
subversion/trunk/subversion/libsvn_client/util.c
Modified: subversion/trunk/subversion/include/private/svn_client_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_client_private.h?rev=1352614&r1=1352613&r2=1352614&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_client_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_client_private.h Thu Jun 21 16:57:25 2012
@@ -159,7 +159,7 @@ svn_client__youngest_common_ancestor(con
svn_error_t *
svn_client__wc_node_get_base(svn_client__pathrev_t **base_p,
const char *wc_abspath,
- svn_client_ctx_t *ctx,
+ svn_wc_context_t *wc_ctx,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
Modified: subversion/trunk/subversion/libsvn_client/switch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/switch.c?rev=1352614&r1=1352613&r2=1352614&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/switch.c (original)
+++ subversion/trunk/subversion/libsvn_client/switch.c Thu Jun 21 16:57:25 2012
@@ -203,7 +203,7 @@ switch_internal(svn_revnum_t *result_rev
svn_client__pathrev_t *target_base_loc, *yca;
SVN_ERR(svn_client__wc_node_get_base(&target_base_loc, local_abspath,
- ctx, pool, pool));
+ ctx->wc_ctx, pool, pool));
if (!target_base_loc)
yca = NULL; /* Not versioned */
Modified: subversion/trunk/subversion/libsvn_client/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/update.c?rev=1352614&r1=1352613&r2=1352614&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/update.c (original)
+++ subversion/trunk/subversion/libsvn_client/update.c Thu Jun 21 16:57:25 2012
@@ -222,7 +222,7 @@ update_internal(svn_revnum_t *result_rev
/* Check if our anchor exists in BASE. If it doesn't we can't update. */
SVN_ERR(svn_client__wc_node_get_base(&anchor_loc, anchor_abspath,
- ctx, pool, pool));
+ ctx->wc_ctx, pool, pool));
/* It does not make sense to update conflict victims. */
err = svn_wc_conflicted_p3(&text_conflicted, &prop_conflicted,
Modified: subversion/trunk/subversion/libsvn_client/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/util.c?rev=1352614&r1=1352613&r2=1352614&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/util.c (original)
+++ subversion/trunk/subversion/libsvn_client/util.c Thu Jun 21 16:57:25 2012
@@ -170,10 +170,10 @@ svn_client_commit_item3_dup(const svn_cl
svn_error_t *
svn_client__wc_node_get_base(svn_client__pathrev_t **base_p,
- const char *wc_abspath,
- svn_client_ctx_t *ctx,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+ const char *wc_abspath,
+ svn_wc_context_t *wc_ctx,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
const char *relpath;
@@ -183,7 +183,7 @@ svn_client__wc_node_get_base(svn_client_
&relpath,
&(*base_p)->repos_root_url,
&(*base_p)->repos_uuid,
- ctx->wc_ctx, wc_abspath,
+ wc_ctx, wc_abspath,
result_pool, scratch_pool));
if ((*base_p)->repos_root_url && relpath)
{