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/07/26 20:17:02 UTC
svn commit: r979397 - in /subversion/trunk/subversion/libsvn_wc: adm_ops.c
props.c workqueue.c
Author: philip
Date: Mon Jul 26 18:17:01 2010
New Revision: 979397
URL: http://svn.apache.org/viewvc?rev=979397&view=rev
Log:
Fix compiler warnings about unused variables and function.
* subversion/libsvn_wc/props.c
(svn_wc__perform_props_merge): Remove unused variable.
* subversion/libsvn_wc/adm_ops.c
(svn_wc_delete4): Remove unused variables.
* subversion/libsvn_wc/workqueue.c
(move_if_present): Remove.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/props.c
subversion/trunk/subversion/libsvn_wc/workqueue.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=979397&r1=979396&r2=979397&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Mon Jul 26 18:17:01 2010
@@ -719,8 +719,7 @@ svn_wc_delete4(svn_wc_context_t *wc_ctx,
apr_pool_t *pool)
{
svn_wc__db_t *db = wc_ctx->db;
- svn_boolean_t was_add = FALSE, was_replace = FALSE;
- svn_boolean_t was_copied = FALSE;
+ svn_boolean_t was_add = FALSE;
svn_error_t *err;
svn_wc__db_status_t status;
svn_wc__db_kind_t kind;
@@ -767,9 +766,6 @@ svn_wc_delete4(svn_wc_context_t *wc_ctx,
NULL, NULL, NULL, NULL, NULL,
db, local_abspath, pool, pool));
- was_copied = (status == svn_wc__db_status_copied ||
- status == svn_wc__db_status_moved_here);
-
if (!have_base)
was_add = strcmp(op_root_abspath, local_abspath) == 0;
else
@@ -780,9 +776,7 @@ svn_wc_delete4(svn_wc_context_t *wc_ctx,
NULL, NULL, NULL, NULL, NULL,
db, local_abspath, pool, pool));
- if (base_status != svn_wc__db_status_not_present)
- was_replace = TRUE;
- else
+ if (base_status == svn_wc__db_status_not_present)
was_add = TRUE;
}
}
@@ -824,8 +818,6 @@ svn_wc_delete4(svn_wc_context_t *wc_ctx,
/* ### Maybe we should disallow deleting switched nodes here? */
{
- const char *parent_abspath = svn_dirent_dirname(local_abspath, pool);
-
/* ### The following two operations should be inside one SqLite
transaction. For even better behavior the tree operation
before this block needs the same handling.
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=979397&r1=979396&r2=979397&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Mon Jul 26 18:17:01 2010
@@ -493,7 +493,6 @@ svn_wc__perform_props_merge(svn_wc_notif
{
apr_array_header_t *prop_diffs;
- svn_skel_t *work_item;
SVN_ERR(svn_prop_diffs(&prop_diffs, new_actual_props, new_base_props,
pool));
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=979397&r1=979396&r2=979397&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Mon Jul 26 18:17:01 2010
@@ -141,30 +141,6 @@ get_and_record_fileinfo(svn_wc__db_t *db
}
-/* If SOURCE_ABSPATH is present, then move it to DEST_ABSPATH. Ignore any
- ENOENT message for a missing source, which may indicate the move has
- already been performed. */
-static svn_error_t *
-move_if_present(const char *source_abspath,
- const char *dest_abspath,
- apr_pool_t *scratch_pool)
-{
- svn_error_t *err;
-
- err = svn_io_file_rename(source_abspath, dest_abspath, scratch_pool);
- if (err)
- {
- if (!APR_STATUS_IS_ENOENT(err->apr_err))
- return svn_error_return(err);
-
- /* Not there. Maybe the node was moved in a prior run. */
- svn_error_clear(err);
- }
-
- return SVN_NO_ERROR;
-}
-
-
/* ------------------------------------------------------------------------ */
/* OP_REVERT */