svn commit: r1095439 - /subversion/trunk/subversion/libsvn_repos/rev_hunt.c

[pb...@apache.org]

Author: pburba
Date: Wed Apr 20 15:53:17 2011
New Revision: 1095439

URL: http://svn.apache.org/viewvc?rev=1095439&view=rev
Log:
* subversion/libsvn_repos/rev_hunt.c
  (find_merged_revisions): Rename variable with the same name as the C++
   'new' operator keyword.  No functional change.

Modified:
    subversion/trunk/subversion/libsvn_repos/rev_hunt.c

Modified: subversion/trunk/subversion/libsvn_repos/rev_hunt.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/rev_hunt.c?rev=1095439&r1=1095438&r2=1095439&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/rev_hunt.c (original)
+++ subversion/trunk/subversion/libsvn_repos/rev_hunt.c Wed Apr 20 15:53:17 2011
@@ -1234,7 +1234,7 @@ find_merged_revisions(apr_array_header_t
                       apr_pool_t *pool)
 {
   const apr_array_header_t *old;
-  apr_array_header_t *new;
+  apr_array_header_t *new_merged_path_revs;
   apr_pool_t *iterpool, *last_pool;
   apr_array_header_t *merged_path_revisions = apr_array_make(pool, 0,
                                                 sizeof(struct path_revision *));
@@ -1249,7 +1249,8 @@ find_merged_revisions(apr_array_header_t
       apr_pool_t *temp_pool;
 
       svn_pool_clear(iterpool);
-      new = apr_array_make(iterpool, 0, sizeof(struct path_revision *));
+      new_merged_path_revs = apr_array_make(iterpool, 0,
+                                            sizeof(struct path_revision *));
 
       /* Iterate over OLD, checking for non-empty mergeinfo.  If found, gather
          path_revisions for any merged revisions, and store those in NEW. */
@@ -1297,7 +1298,8 @@ find_merged_revisions(apr_array_header_t
                     continue;
 
                   /* Search and find revisions to add to the NEW list. */
-                  SVN_ERR(find_interesting_revisions(new, repos, path,
+                  SVN_ERR(find_interesting_revisions(new_merged_path_revs,
+                                                     repos, path,
                                                      range->start, range->end,
                                                      TRUE, TRUE,
                                                      duplicate_path_revs,
@@ -1312,15 +1314,15 @@ find_merged_revisions(apr_array_header_t
 
       /* Append the newly found path revisions with the old ones. */
       merged_path_revisions = apr_array_append(iterpool, merged_path_revisions,
-                                               new);
+                                               new_merged_path_revs);
 
       /* Swap data structures */
-      old = new;
+      old = new_merged_path_revs;
       temp_pool = last_pool;
       last_pool = iterpool;
       iterpool = temp_pool;
     }
-  while (new->nelts > 0);
+  while (new_merged_path_revs->nelts > 0);
 
   /* Sort MERGED_PATH_REVISIONS in increasing order by REVNUM. */
   qsort(merged_path_revisions->elts, merged_path_revisions->nelts,