Author: stsp
Date: Thu Jun 25 15:39:25 2015
New Revision: 1687562
URL: http://svn.apache.org/r1687562
Log:
Fix another shadowed local variable introduced in r1687498.
* subversion/svn/info-cmd.c
(print_info): Don't shadow 'desc'.
Found by: philip
Modified:
subversion/trunk/subversion/svn/info-cmd.c
Modified: subversion/trunk/subversion/svn/info-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/info-cmd.c?rev=1687562&r1=1687561&r2=1687562&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/info-cmd.c (original)
+++ subversion/trunk/subversion/svn/info-cmd.c Thu Jun 25 15:39:25 2015
@@ -687,13 +687,13 @@ print_info(void *baton,
const char *repos_relpath;
svn_revnum_t peg_rev;
svn_node_kind_t node_kind;
- const svn_wc_conflict_description2_t *desc =
+ const svn_wc_conflict_description2_t *desc2 =
APR_ARRAY_IDX(info->wc_info->conflicts, 0,
const svn_wc_conflict_description2_t *);
svn_client_conflict_t *conflict;
- conflict = svn_client_conflict_from_wc_description2_t(desc,
+ conflict = svn_client_conflict_from_wc_description2_t(desc2,
pool, pool);
if (!printed_tc)
{
