You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/03/01 15:04:38 UTC
svn commit: r917536 - in /subversion/trunk/subversion/libsvn_wc: adm_ops.c
workqueue.c workqueue.h
Author: philip
Date: Mon Mar 1 14:04:38 2010
New Revision: 917536
URL: http://svn.apache.org/viewvc?rev=917536&view=rev
Log:
Remove a function parameter that is not needed.
* subversion/libsvn_wc/workqueue.h
(svn_wc__wq_add_delete): Remove base_shadowed.
* subversion/libsvn_wc/workqueue.c
(svn_wc__wq_add_delete): Remove base_shadowed.
* subversion/libsvn_wc/adm_ops.c
(svn_wc_delete4): Adjust call.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/workqueue.c
subversion/trunk/subversion/libsvn_wc/workqueue.h
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=917536&r1=917535&r2=917536&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Mon Mar 1 14:04:38 2010
@@ -1187,7 +1187,7 @@
SVN_ERR(svn_wc__db_temp_op_delete(wc_ctx->db, local_abspath, pool));
SVN_ERR(svn_wc__wq_add_delete(wc_ctx->db, parent_abspath, local_abspath,
kind, was_add, was_copied, was_replace,
- base_shadowed, pool));
+ pool));
SVN_ERR(svn_wc__wq_run(db, parent_abspath, cancel_func, cancel_baton,
pool));
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=917536&r1=917535&r2=917536&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Mon Mar 1 14:04:38 2010
@@ -1731,7 +1731,7 @@
const svn_skel_t *arg = work_item->children->next;
const char *local_abspath;
svn_wc__db_kind_t kind;
- svn_boolean_t was_added, was_copied, was_replaced, base_shadowed;
+ svn_boolean_t was_added, was_copied, was_replaced;
local_abspath = apr_pstrmemdup(scratch_pool, arg->data, arg->len);
arg = arg->next;
@@ -1742,8 +1742,6 @@
was_copied = (svn_boolean_t) svn_skel__parse_int(arg, scratch_pool);
arg = arg->next;
was_replaced = (svn_boolean_t) svn_skel__parse_int(arg, scratch_pool);
- arg = arg->next;
- base_shadowed = (svn_boolean_t) svn_skel__parse_int(arg, scratch_pool);
if (was_replaced && was_copied)
{
@@ -1805,12 +1803,10 @@
svn_boolean_t was_added,
svn_boolean_t was_copied,
svn_boolean_t was_replaced,
- svn_boolean_t base_shadowed,
apr_pool_t *scratch_pool)
{
svn_skel_t *work_item = svn_skel__make_empty_list(scratch_pool);
- svn_skel__prepend_int(base_shadowed, work_item, scratch_pool);
svn_skel__prepend_int(was_replaced, work_item, scratch_pool);
svn_skel__prepend_int(was_copied, work_item, scratch_pool);
svn_skel__prepend_int(was_added, work_item, scratch_pool);
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.h?rev=917536&r1=917535&r2=917536&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.h (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.h Mon Mar 1 14:04:38 2010
@@ -131,7 +131,6 @@
svn_boolean_t was_added,
svn_boolean_t was_copied,
svn_boolean_t was_replaced,
- svn_boolean_t base_shadowed,
apr_pool_t *scratch_pool);
#ifdef __cplusplus