Author: stylesen
Date: Mon Nov 30 17:13:41 2009
New Revision: 885500

URL: http://svn.apache.org/viewvc?rev=885500&view=rev
Log:
Fix warning of shadowed declaration.

* subversion/libsvn_wc/lock.c
  (svn_wc__acquire_write_lock): s/basename/base/

Modified:
    subversion/trunk/subversion/libsvn_wc/lock.c

Modified: subversion/trunk/subversion/libsvn_wc/lock.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/lock.c?rev=885500&r1=885499&r2=885500&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/lock.c (original)
+++ subversion/trunk/subversion/libsvn_wc/lock.c Mon Nov 30 17:13:41 2009
@@ -1738,10 +1738,10 @@
 
   if (anchor_abspath)
     {
-      const char *parent_abspath, *basename;
+      const char *parent_abspath, *base;
       svn_error_t *err;
 
-      svn_dirent_split(local_abspath, &parent_abspath, &basename, 
scratch_pool);
+      svn_dirent_split(local_abspath, &parent_abspath, &base, scratch_pool);
       err = svn_wc__db_read_children(&children, wc_ctx->db, parent_abspath,
                                      scratch_pool, scratch_pool);
       if (err)
@@ -1749,7 +1749,7 @@
       else
         {
           for (i = 0; i < children->nelts; ++i)
-            if (! strcmp(APR_ARRAY_IDX(children, i, const char *), basename))
+            if (! strcmp(APR_ARRAY_IDX(children, i, const char *), base))
               break;
           if (i < children->nelts)
             parent_is_anchor = TRUE;


Reply via email to