subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1636614 - in /subversion/trunk/subversion/libsvn_fs_x: cached_data.c transaction.c
Date Tue, 04 Nov 2014 15:44:40 GMT
Author: stefan2
Date: Tue Nov  4 15:44:39 2014
New Revision: 1636614

URL: http://svn.apache.org/r1636614
Log:
Remove unnecessary conditions from FSX code.

* cached_data.c
  (svn_fs_x__rep_chain_length): FSX respositories are always sharded.

* transaction.c
  (shards_spanned): Same.

Modified:
    subversion/trunk/subversion/libsvn_fs_x/cached_data.c
    subversion/trunk/subversion/libsvn_fs_x/transaction.c

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=1636614&r1=1636613&r2=1636614&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/cached_data.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/cached_data.c Tue Nov  4 15:44:39 2014
@@ -861,9 +861,7 @@ svn_fs_x__rep_chain_length(int *chain_le
                            apr_pool_t *scratch_pool)
 {
   fs_x_data_t *ffd = fs->fsap_data;
-  svn_revnum_t shard_size = ffd->max_files_per_dir
-                          ? ffd->max_files_per_dir
-                          : 1;
+  svn_revnum_t shard_size = ffd->max_files_per_dir;
   svn_boolean_t is_delta = FALSE;
   int count = 0;
   int shards = 1;

Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1636614&r1=1636613&r2=1636614&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Tue Nov  4 15:44:39 2014
@@ -1904,7 +1904,7 @@ shards_spanned(int *spanned,
                apr_pool_t *pool)
 {
   fs_x_data_t *ffd = fs->fsap_data;
-  int shard_size = ffd->max_files_per_dir ? ffd->max_files_per_dir : 1;
+  int shard_size = ffd->max_files_per_dir;
   apr_pool_t *iterpool;
 
   int count = walk ? 1 : 0; /* The start of a walk already touches a shard. */



Mime
View raw message