You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2014/03/19 16:30:23 UTC
svn commit: r1579263 -
/subversion/trunk/subversion/libsvn_client/locking_commands.c
Author: rhuijben
Date: Wed Mar 19 15:30:22 2014
New Revision: 1579263
URL: http://svn.apache.org/r1579263
Log:
* subversion/libsvn_client/locking_commands.c
(organize_lock_targets): Following up on r1579257, remove
two variables and change the scope of another one. This resolves
a few shadowed variable warnings.
Modified:
subversion/trunk/subversion/libsvn_client/locking_commands.c
Modified: subversion/trunk/subversion/libsvn_client/locking_commands.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/locking_commands.c?rev=1579263&r1=1579262&r2=1579263&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/locking_commands.c (original)
+++ subversion/trunk/subversion/libsvn_client/locking_commands.c Wed Mar 19 15:30:22 2014
@@ -248,7 +248,6 @@ organize_lock_targets(apr_array_header_t
apr_hash_t *rel_fs_paths = NULL;
apr_hash_t *wc_info = apr_hash_make(scratch_pool);
svn_boolean_t url_mode;
- int i;
*lock_paths = NULL;
@@ -260,6 +259,7 @@ organize_lock_targets(apr_array_header_t
if (url_mode)
{
apr_array_header_t *rel_targets;
+ int i;
svn_revnum_t *invalid_revnum =
apr_palloc(result_pool, sizeof(*invalid_revnum));
@@ -425,13 +425,8 @@ organize_lock_targets(apr_array_header_t
if (do_lock) /* Lock. */
{
svn_revnum_t *revnum;
- struct wc_lock_item_t *wli;
revnum = apr_palloc(result_pool, sizeof(* revnum));
- wli = svn_hash_gets(wc_info, local_abspath);
-
- SVN_ERR_ASSERT(wli != NULL);
-
*revnum = wli->revision;
svn_hash_sets(rel_targets_ret, rel_url, revnum);
@@ -439,15 +434,10 @@ organize_lock_targets(apr_array_header_t
else /* Unlock. */
{
const char *lock_token;
- struct wc_lock_item_t *wli;
/* If not forcing the unlock, get the lock token. */
if (! force)
{
- wli = svn_hash_gets(wc_info, local_abspath);
-
- SVN_ERR_ASSERT(wli != NULL);
-
if (! wli->lock_token)
return svn_error_createf(
SVN_ERR_CLIENT_MISSING_LOCK_TOKEN, NULL,