Author: rhuijben
Date: Sat Jan 19 00:49:25 2013
New Revision: 1435429
URL: http://svn.apache.org/viewvc?rev=1435429&view=rev
Log:
* subversion/include/private/svn_wc_private.h
(svn_wc__check_for_obstructions): Remove unused optional output argument.
* subversion/libsvn_client/merge.c
(perform_obstruction_check): Remove unused optional output argument.
(merge_dir_props_changed,
merge_file_changed,
merge_file_added,
merge_file_deleted,
merge_dir_added,
merge_dir_deleted,
merge_dir_opened,
record_skips): Update caller.
* subversion/libsvn_wc/node.c
(svn_wc__check_for_obstructions): Remove unused optional output argument.
Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_wc/node.c
Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=1435429&r1=1435428&r2=1435429&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Sat Jan 19
00:49:25 2013
@@ -1107,9 +1107,6 @@ svn_wc__get_not_present_descendants(cons
* If KIND is not NULL, set *KIND to the kind of node registered in the working
* copy, or SVN_NODE_NONE if the node doesn't
*
- * If ADDED is not NULL, set *ADDED to TRUE if the node is added. (Addition,
- * copy or moved).
- *
* If DELETED is not NULL, set *DELETED to TRUE if the node is marked as
* deleted in the working copy.
*
@@ -1121,7 +1118,6 @@ svn_wc__get_not_present_descendants(cons
svn_error_t *
svn_wc__check_for_obstructions(svn_wc_notify_state_t *obstruction_state,
svn_node_kind_t *kind,
- svn_boolean_t *added,
svn_boolean_t *deleted,
svn_wc_context_t *wc_ctx,
const char *local_abspath,
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1435429&r1=1435428&r2=1435429&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Sat Jan 19 00:49:25 2013
@@ -524,7 +524,6 @@ is_path_conflicted_by_merge(merge_cmd_ba
**/
static svn_error_t *
perform_obstruction_check(svn_wc_notify_state_t *obstruction_state,
- svn_boolean_t *added,
svn_boolean_t *deleted,
svn_node_kind_t *kind,
const merge_cmd_baton_t *merge_b,
@@ -540,8 +539,6 @@ perform_obstruction_check(svn_wc_notify_
*obstruction_state = svn_wc_notify_state_inapplicable;
- if (added)
- *added = FALSE;
if (deleted)
*deleted = FALSE;
if (kind)
@@ -552,7 +549,8 @@ perform_obstruction_check(svn_wc_notify_
{
if (dry_run_deleted_p(merge_b, local_abspath))
{
- *obstruction_state = svn_wc_notify_state_inapplicable;
+ /* svn_wc_notify_state_inapplicable */
+ /* svn_node_none */
if (deleted)
*deleted = TRUE;
@@ -564,10 +562,8 @@ perform_obstruction_check(svn_wc_notify_
}
else if (dry_run_added_p(merge_b, local_abspath))
{
- *obstruction_state = svn_wc_notify_state_inapplicable;
+ /* svn_wc_notify_state_inapplicable */
- if (added)
- *added = TRUE;
if (kind)
*kind = svn_node_dir; /* Currently only used for dirs */
@@ -577,7 +573,8 @@ perform_obstruction_check(svn_wc_notify_
svn_dirent_dirname(local_abspath,
scratch_pool)))
{
- *obstruction_state = svn_wc_notify_state_inapplicable;
+ /* svn_wc_notify_state_inapplicable */
+ /* svn_node_none */
return SVN_NO_ERROR;
}
@@ -590,7 +587,6 @@ perform_obstruction_check(svn_wc_notify_
SVN_ERR(svn_wc__check_for_obstructions(obstruction_state,
kind,
- added,
deleted,
wc_ctx, local_abspath,
check_root,
@@ -1419,8 +1415,7 @@ merge_dir_props_changed(svn_wc_notify_st
svn_boolean_t is_deleted;
svn_node_kind_t kind;
- SVN_ERR(perform_obstruction_check(&obstr_state, NULL, &is_deleted,
- &kind,
+ SVN_ERR(perform_obstruction_check(&obstr_state, &is_deleted, &kind,
merge_b, local_abspath, svn_node_dir,
scratch_pool));
@@ -1610,8 +1605,7 @@ merge_file_changed(svn_wc_notify_state_t
{
svn_wc_notify_state_t obstr_state;
- SVN_ERR(perform_obstruction_check(&obstr_state, NULL,
- &is_deleted, &wc_kind,
+ SVN_ERR(perform_obstruction_check(&obstr_state, &is_deleted, &wc_kind,
merge_b, local_abspath, svn_node_unknown,
scratch_pool));
if (obstr_state != svn_wc_notify_state_inapplicable)
@@ -1857,7 +1851,7 @@ merge_file_added(svn_wc_notify_state_t *
{
svn_wc_notify_state_t obstr_state;
- SVN_ERR(perform_obstruction_check(&obstr_state, NULL, &is_deleted, &kind,
+ SVN_ERR(perform_obstruction_check(&obstr_state, &is_deleted, &kind,
merge_b, local_abspath, svn_node_unknown,
scratch_pool));
@@ -2123,7 +2117,7 @@ merge_file_deleted(svn_wc_notify_state_t
{
svn_wc_notify_state_t obstr_state;
- SVN_ERR(perform_obstruction_check(&obstr_state, NULL, &is_deleted, &kind,
+ SVN_ERR(perform_obstruction_check(&obstr_state, &is_deleted, &kind,
merge_b, local_abspath, svn_node_unknown,
scratch_pool));
@@ -2267,8 +2261,7 @@ merge_dir_added(svn_wc_notify_state_t *s
{
svn_wc_notify_state_t obstr_state;
- SVN_ERR(perform_obstruction_check(&obstr_state, NULL,
- &is_deleted, &kind,
+ SVN_ERR(perform_obstruction_check(&obstr_state, &is_deleted, &kind,
merge_b, local_abspath, svn_node_unknown,
scratch_pool));
@@ -2378,8 +2371,7 @@ merge_dir_deleted(svn_wc_notify_state_t
{
svn_wc_notify_state_t obstr_state;
- SVN_ERR(perform_obstruction_check(&obstr_state, NULL,
- &is_deleted, &kind,
+ SVN_ERR(perform_obstruction_check(&obstr_state, &is_deleted, &kind,
merge_b, local_abspath, svn_node_unknown,
scratch_pool));
@@ -2485,8 +2477,7 @@ merge_dir_opened(svn_boolean_t *tree_con
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
/* Check for an obstructed or missing node on disk. */
- SVN_ERR(perform_obstruction_check(&obstr_state, NULL,
- &is_deleted, &wc_kind,
+ SVN_ERR(perform_obstruction_check(&obstr_state, &is_deleted, &wc_kind,
merge_b, local_abspath, svn_node_unknown,
scratch_pool));
@@ -4705,8 +4696,7 @@ record_skips(const char *mergeinfo_path,
/* Before we override, make sure this is a versioned path, it might
be an external or missing from disk due to authz restrictions. */
- SVN_ERR(perform_obstruction_check(&obstruction_state,
- NULL, NULL, NULL,
+ SVN_ERR(perform_obstruction_check(&obstruction_state, NULL, NULL,
merge_b, skipped_abspath,
svn_node_unknown, iterpool));
if (obstruction_state == svn_wc_notify_state_obstructed
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=1435429&r1=1435428&r2=1435429&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Sat Jan 19 00:49:25 2013
@@ -1271,7 +1271,6 @@ svn_wc__rename_wc(svn_wc_context_t *wc_c
svn_error_t *
svn_wc__check_for_obstructions(svn_wc_notify_state_t *obstruction_state,
svn_node_kind_t *kind,
- svn_boolean_t *added,
svn_boolean_t *deleted,
svn_wc_context_t *wc_ctx,
const char *local_abspath,
@@ -1286,8 +1285,6 @@ svn_wc__check_for_obstructions(svn_wc_no
*obstruction_state = svn_wc_notify_state_inapplicable;
if (kind)
*kind = svn_node_none;
- if (added)
- *added = FALSE;
if (deleted)
*deleted = FALSE;
@@ -1380,9 +1377,6 @@ svn_wc__check_for_obstructions(svn_wc_no
break;
case svn_wc__db_status_added:
- if (added)
- *added = TRUE;
- /* Fall through to svn_wc__db_status_normal */
case svn_wc__db_status_normal:
if (disk_kind == svn_node_none)
*obstruction_state = svn_wc_notify_state_missing;
