svn commit: r1132925 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

[philip]

Author: philip
Date: Tue Jun  7 09:37:07 2011
New Revision: 1132925

URL: http://svn.apache.org/viewvc?rev=1132925&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_get_conflict_marker_files): Rename variable to avoid
   shadowing.

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

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1132925&r1=1132924&r2=1132925&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Jun  7 09:37:07 2011
@@ -10150,7 +10150,7 @@ svn_wc__db_get_conflict_marker_files(apr
     {
       /* Collect the basenames of any conflict marker files. */
       const char *marker_relpath;
-      const char *basename;
+      const char *base_name;
       int i;
 
       for (i = 0; i < 4; i++)
@@ -10158,9 +10158,9 @@ svn_wc__db_get_conflict_marker_files(apr
           marker_relpath = svn_sqlite__column_text(stmt, i, scratch_pool);
           if (marker_relpath)
             {
-              basename = svn_dirent_basename(marker_relpath, result_pool);
-              apr_hash_set(*marker_files, basename, APR_HASH_KEY_STRING,
-                           basename);
+              base_name = svn_dirent_basename(marker_relpath, result_pool);
+              apr_hash_set(*marker_files, base_name, APR_HASH_KEY_STRING,
+                           base_name);
             }
         }