subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1595673 - in /subversion/trunk/subversion/libsvn_fs_x: ./ cached_data.c transaction.c
Date Sun, 18 May 2014 20:25:25 GMT
Author: stefan2
Date: Sun May 18 20:25:25 2014
New Revision: 1595673

URL: http://svn.apache.org/r1595673
Log:
Sync'ing FSX with FSFS:
Merge r1577079 from /subversion/libsvn_fs_fs into subversion/libsvn_fs_x.
There were no conflicts.

This makes FSX use svn_sort__array instead of qsort.

Modified:
    subversion/trunk/subversion/libsvn_fs_x/   (props changed)
    subversion/trunk/subversion/libsvn_fs_x/cached_data.c
    subversion/trunk/subversion/libsvn_fs_x/transaction.c

Propchange: subversion/trunk/subversion/libsvn_fs_x/
------------------------------------------------------------------------------
  Merged /subversion/trunk/subversion/libsvn_fs_fs:r1577079

Modified: subversion/trunk/subversion/libsvn_fs_x/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/cached_data.c?rev=1595673&r1=1595672&r2=1595673&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/cached_data.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/cached_data.c Sun May 18 20:25:25 2014
@@ -2427,7 +2427,7 @@ read_dir_entries(apr_array_header_t *ent
     }
 
   if (!sorted(entries))
-    qsort(entries->elts, entries->nelts, entries->elt_size, compare_dirents);
+    svn_sort__array(entries, compare_dirents);
 
   svn_pool_destroy(iterpool);
 

Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1595673&r1=1595672&r2=1595673&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Sun May 18 20:25:25 2014
@@ -3101,8 +3101,7 @@ verify_locks(svn_fs_t *fs,
                                  sizeof(const char *));
   for (hi = apr_hash_first(pool, changes); hi; hi = apr_hash_next(hi))
     APR_ARRAY_PUSH(changed_paths, const char *) = svn__apr_hash_index_key(hi);
-  qsort(changed_paths->elts, changed_paths->nelts,
-        changed_paths->elt_size, svn_sort_compare_paths);
+  svn_sort__array(changed_paths, svn_sort_compare_paths);
 
   /* Now, traverse the array of changed paths, verify locks.  Note
      that if we need to do a recursive verification a path, we'll skip
@@ -3235,8 +3234,7 @@ verify_moves(svn_fs_t *fs,
   /* correct the deletions that refer to moved paths and make them refer to
      the paths in OLD_REV */
 
-  qsort(moves->elts, moves->nelts, moves->elt_size,
-        svn_sort_compare_paths);
+  svn_sort__array(moves, svn_sort_compare_paths);
 
   for (i = 0; i < deletions->nelts; ++i)
     {
@@ -3261,8 +3259,7 @@ verify_moves(svn_fs_t *fs,
         }
     }
 
-  qsort(deletions->elts, deletions->nelts, deletions->elt_size,
-        svn_sort_compare_paths);
+  svn_sort__array(deletions, svn_sort_compare_paths);
 
   /* The _same_ source paths must never occur more than once in any move 
      since our base revision. */



Mime
View raw message