Author: danielsh
Date: Tue Mar 29 05:06:42 2011
New Revision: 1086475
URL: http://svn.apache.org/viewvc?rev=1086475&view=rev
Log:
Rename some variable and structs for clarity. No functional change.
* subversion/libsvn_client/merge.c
(merge_baton_t): Was merge_baton.
(merge_cb): Track rename.
(svn_client_merge4): Rename local variable, and track rename
* subversion/libsvn_client/merge.c
(merge_reintegrate_baton_t): Was merge_reintegrate_baton.
(merge_reintegrate_cb): Track rename.
(svn_client_merge_reintegrate): Rename local variable, and track rename
* subversion/libsvn_client/merge.c
(merge_peg_baton_t): Was merge_peg_baton.
(merge_peg_cb): Track rename.
(svn_client_merge_peg4): Rename local variable, and track rename
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1086475&r1=1086474&r2=1086475&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Mar 29 05:06:42 2011
@@ -9340,7 +9340,7 @@ merge_locked(const char *source1,
return SVN_NO_ERROR;
}
-struct merge_baton {
+struct merge_baton_t {
const char *source1;
const svn_opt_revision_t *revision1;
const char *source2;
@@ -9360,7 +9360,7 @@ struct merge_baton {
static svn_error_t *
merge_cb(void *baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
{
- struct merge_baton *b = baton;
+ struct merge_baton_t *b = baton;
SVN_ERR(merge_locked(b->source1, b->revision1, b->source2, b->revision2,
b->target_abspath, b->depth, b->ignore_ancestry,
@@ -9410,31 +9410,31 @@ svn_client_merge4(const char *source1,
apr_pool_t *pool)
{
const char *target_abspath, *lock_abspath;
- struct merge_baton baton;
+ struct merge_baton_t merge_baton;
SVN_ERR(get_target_and_lock_abspath(&target_abspath, &lock_abspath,
target_wcpath, ctx, pool));
- baton.source1 = source1;
- baton.revision1 = revision1;
- baton.source2 = source2;
- baton.revision2 = revision2;
- baton.target_abspath = target_abspath;
- baton.depth = depth;
- baton.ignore_ancestry = ignore_ancestry;
- baton.force = force;
- baton.record_only = record_only;
- baton.dry_run = dry_run;
- baton.allow_mixed_rev = allow_mixed_rev;
- baton.merge_options = merge_options;
- baton.ctx = ctx;
+ merge_baton.source1 = source1;
+ merge_baton.revision1 = revision1;
+ merge_baton.source2 = source2;
+ merge_baton.revision2 = revision2;
+ merge_baton.target_abspath = target_abspath;
+ merge_baton.depth = depth;
+ merge_baton.ignore_ancestry = ignore_ancestry;
+ merge_baton.force = force;
+ merge_baton.record_only = record_only;
+ merge_baton.dry_run = dry_run;
+ merge_baton.allow_mixed_rev = allow_mixed_rev;
+ merge_baton.merge_options = merge_options;
+ merge_baton.ctx = ctx;
if (!dry_run)
- SVN_ERR(svn_wc__call_with_write_lock(merge_cb, &baton,
+ SVN_ERR(svn_wc__call_with_write_lock(merge_cb, &merge_baton,
ctx->wc_ctx, lock_abspath, FALSE,
pool, pool));
else
- SVN_ERR(merge_cb(&baton, pool, pool));
+ SVN_ERR(merge_cb(&merge_baton, pool, pool));
return SVN_NO_ERROR;
}
@@ -10500,7 +10500,7 @@ merge_reintegrate_locked(const char *sou
return SVN_NO_ERROR;
}
-struct merge_reintegrate_baton {
+struct merge_reintegrate_baton_t {
const char *source;
const svn_opt_revision_t *peg_revision;
const char *target_abspath;
@@ -10515,7 +10515,7 @@ merge_reintegrate_cb(void *baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- struct merge_reintegrate_baton *b = baton;
+ struct merge_reintegrate_baton_t *b = baton;
SVN_ERR(merge_reintegrate_locked(b->source, b->peg_revision,
b->target_abspath, b->dry_run,
@@ -10535,24 +10535,25 @@ svn_client_merge_reintegrate(const char
apr_pool_t *pool)
{
const char *target_abspath, *lock_abspath;
- struct merge_reintegrate_baton baton;
+ struct merge_reintegrate_baton_t merge_reintegrate_baton;
SVN_ERR(get_target_and_lock_abspath(&target_abspath, &lock_abspath,
target_wcpath, ctx, pool));
- baton.source = source;
- baton.peg_revision = peg_revision;
- baton.target_abspath = target_abspath;
- baton.dry_run = dry_run;
- baton.merge_options = merge_options;
- baton.ctx = ctx;
+ merge_reintegrate_baton.source = source;
+ merge_reintegrate_baton.peg_revision = peg_revision;
+ merge_reintegrate_baton.target_abspath = target_abspath;
+ merge_reintegrate_baton.dry_run = dry_run;
+ merge_reintegrate_baton.merge_options = merge_options;
+ merge_reintegrate_baton.ctx = ctx;
if (!dry_run)
- SVN_ERR(svn_wc__call_with_write_lock(merge_reintegrate_cb, &baton,
+ SVN_ERR(svn_wc__call_with_write_lock(merge_reintegrate_cb,
+ &merge_reintegrate_baton,
ctx->wc_ctx, lock_abspath, FALSE,
pool, pool));
else
- SVN_ERR(merge_reintegrate_cb(&baton, pool, pool));
+ SVN_ERR(merge_reintegrate_cb(&merge_reintegrate_baton, pool, pool));
return SVN_NO_ERROR;
}
@@ -10666,7 +10667,7 @@ merge_peg_locked(const char *source,
return SVN_NO_ERROR;
}
-struct merge_peg_baton {
+struct merge_peg_baton_t {
const char *source;
const apr_array_header_t *ranges_to_merge;
const svn_opt_revision_t *peg_revision;
@@ -10685,7 +10686,7 @@ struct merge_peg_baton {
static svn_error_t *
merge_peg_cb(void *baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
{
- struct merge_peg_baton *b = baton;
+ struct merge_peg_baton_t *b = baton;
SVN_ERR(merge_peg_locked(b->source, b->ranges_to_merge, b->peg_revision,
b->target_abspath, b->depth, b->ignore_ancestry,
@@ -10712,7 +10713,7 @@ svn_client_merge_peg4(const char *source
apr_pool_t *pool)
{
const char *target_abspath, *lock_abspath;
- struct merge_peg_baton baton;
+ struct merge_peg_baton_t merge_peg_baton;
/* No ranges to merge? No problem. */
if (ranges_to_merge->nelts == 0)
@@ -10721,25 +10722,25 @@ svn_client_merge_peg4(const char *source
SVN_ERR(get_target_and_lock_abspath(&target_abspath, &lock_abspath,
target_wcpath, ctx, pool));
- baton.source = source;
- baton.ranges_to_merge = ranges_to_merge;
- baton.peg_revision = peg_revision;
- baton.target_abspath = target_abspath;
- baton.depth = depth;
- baton.ignore_ancestry = ignore_ancestry;
- baton.force = force;
- baton.record_only = record_only;
- baton.dry_run = dry_run;
- baton.allow_mixed_rev = allow_mixed_rev;
- baton.merge_options = merge_options;
- baton.ctx = ctx;
+ merge_peg_baton.source = source;
+ merge_peg_baton.ranges_to_merge = ranges_to_merge;
+ merge_peg_baton.peg_revision = peg_revision;
+ merge_peg_baton.target_abspath = target_abspath;
+ merge_peg_baton.depth = depth;
+ merge_peg_baton.ignore_ancestry = ignore_ancestry;
+ merge_peg_baton.force = force;
+ merge_peg_baton.record_only = record_only;
+ merge_peg_baton.dry_run = dry_run;
+ merge_peg_baton.allow_mixed_rev = allow_mixed_rev;
+ merge_peg_baton.merge_options = merge_options;
+ merge_peg_baton.ctx = ctx;
if (!dry_run)
- SVN_ERR(svn_wc__call_with_write_lock(merge_peg_cb, &baton,
+ SVN_ERR(svn_wc__call_with_write_lock(merge_peg_cb, &merge_peg_baton,
ctx->wc_ctx, lock_abspath, FALSE,
pool, pool));
else
- SVN_ERR(merge_peg_cb(&baton, pool, pool));
+ SVN_ERR(merge_peg_cb(&merge_peg_baton, pool, pool));
return SVN_NO_ERROR;
}
