svn commit: r1402634 - /subversion/trunk/subversion/libsvn_wc/status.c

[cm...@apache.org]

Author: cmpilato
Date: Fri Oct 26 19:48:08 2012
New Revision: 1402634

URL: http://svn.apache.org/viewvc?rev=1402634&view=rev
Log:
Fix some build warnings of the "shadowed somethingorother" variety.

* subversion/libsvn_wc/status.c
  (send_unversioned_item): Rename 'basename' variable to 'base_name'
    to avoid shadowing the C function of the same name.
  (collect_ignore_patterns): Remove redundant 'i' variable
    declaration.

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

Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1402634&r1=1402633&r2=1402634&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Fri Oct 26 19:48:08 2012
@@ -1008,7 +1008,6 @@ collect_ignore_patterns(apr_array_header
   if (inherited_patterns)
     {
       apr_array_header_t *inherited_props;
-      int i;
 
       *inherited_patterns = apr_array_make(result_pool, 1,
                                            sizeof(const char *));
@@ -1110,10 +1109,10 @@ send_unversioned_item(const struct walk_
   svn_boolean_t is_mandatory_ignored;
   svn_boolean_t is_external;
   svn_wc_status3_t *status;
-  const char *basename = svn_dirent_basename(local_abspath, NULL);
+  const char *base_name = svn_dirent_basename(local_abspath, NULL);
 
-  is_ignored = svn_wc_match_ignore_list(basename, patterns, scratch_pool);
-  is_mandatory_ignored = svn_wc_match_ignore_list(basename,
+  is_ignored = svn_wc_match_ignore_list(base_name, patterns, scratch_pool);
+  is_mandatory_ignored = svn_wc_match_ignore_list(base_name,
                                                   inherited_patterns,
                                                   scratch_pool);
   SVN_ERR(assemble_unversioned(&status,