svn commit: r1652477 - /subversion/trunk/subversion/libsvn_fs_x/util.c

[st...@apache.org]

Author: stefan2
Date: Fri Jan 16 18:23:14 2015
New Revision: 1652477

URL: http://svn.apache.org/r1652477
Log:
Follow-up to r1652469: Fix the revision / revprop file name construction.

* subversion/libsvn_fs_x/util.c
  (svn_fs_x__path_rev): The rev - not the shard - shall be the file name.
  (svn_fs_x__path_revprops): Same.  Also, use the correct pack check.

Modified:
    subversion/trunk/subversion/libsvn_fs_x/util.c

Modified: subversion/trunk/subversion/libsvn_fs_x/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/util.c?rev=1652477&r1=1652476&r2=1652477&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/util.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/util.c Fri Jan 16 18:23:14 2015
@@ -206,10 +206,8 @@ svn_fs_x__path_rev(svn_fs_t *fs,
                    svn_revnum_t rev,
                    apr_pool_t *result_pool)
 {
-  svn_fs_x__data_t *ffd = fs->fsap_data;
-
   char buffer[SVN_INT64_BUFFER_SIZE];
-  svn__i64toa(buffer, rev / ffd->max_files_per_dir);
+  svn__i64toa(buffer, rev);
 
   assert(! svn_fs_x__is_packed_rev(fs, rev));
   return construct_shard_sub_path(fs, rev, FALSE, FALSE, buffer, result_pool);
@@ -252,12 +250,10 @@ svn_fs_x__path_revprops(svn_fs_t *fs,
                         svn_revnum_t rev,
                         apr_pool_t *result_pool)
 {
-  svn_fs_x__data_t *ffd = fs->fsap_data;
-
   char buffer[SVN_INT64_BUFFER_SIZE];
-  svn__i64toa(buffer, rev / ffd->max_files_per_dir);
+  svn__i64toa(buffer, rev);
 
-  assert(! svn_fs_x__is_packed_rev(fs, rev));
+  assert(! svn_fs_x__is_packed_revprop(fs, rev));
   return construct_shard_sub_path(fs, rev, TRUE, FALSE, buffer, result_pool);
 }