subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1499139 - in /subversion/branches/fsfs-format7/subversion/libsvn_fs_fs: util.c util.h
Date Tue, 02 Jul 2013 22:46:47 GMT
Author: stefan2
Date: Tue Jul  2 22:46:46 2013
New Revision: 1499139

URL: http://svn.apache.org/r1499139
Log:
On the fsfs-format7 branch:  Remove a new unused function from FSFS.
These are f7 leftovers.

* subversion/libsvn_fs_fs/util.h
  (packed_base_rev,
   pack_size,
   path_l2p_index,
   path_p2l_index,
   path_l2p_proto_index,
   path_p2l_proto_index,
   path_txn_item_index): drop declaration

* subversion/libsvn_fs_fs/util.c
  (packed_base_rev,
   pack_size,
   path_l2p_index,
   path_p2l_index,
   path_l2p_proto_index,
   path_p2l_proto_index,
   path_txn_item_index): drop implementation

Modified:
    subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/util.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/util.h

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/util.c?rev=1499139&r1=1499138&r2=1499139&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/util.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/util.c Tue Jul  2 22:46:46 2013
@@ -72,24 +72,6 @@ is_packed_revprop(svn_fs_t *fs, svn_revn
       && (ffd->format >= SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT);
 }
 
-svn_revnum_t
-packed_base_rev(svn_fs_t *fs, svn_revnum_t rev)
-{
-  fs_fs_data_t *ffd = fs->fsap_data;
-
-  return rev < ffd->min_unpacked_rev
-       ? rev - (rev % ffd->max_files_per_dir)
-       : rev;
-}
-
-svn_revnum_t
-pack_size(svn_fs_t *fs, svn_revnum_t rev)
-{
-  fs_fs_data_t *ffd = fs->fsap_data;
-
-  return rev < ffd->min_unpacked_rev ? ffd->max_files_per_dir : 1;
-}
-
 const char *
 path_format(svn_fs_t *fs, apr_pool_t *pool)
 {
@@ -179,24 +161,6 @@ path_rev(svn_fs_t *fs, svn_revnum_t rev,
 }
 
 const char *
-path_l2p_index(svn_fs_t *fs,
-               svn_revnum_t rev,
-               apr_pool_t *pool)
-{
-  return apr_psprintf(pool, "%s" PATH_EXT_L2P_INDEX,
-                      svn_fs_fs__path_rev_absolute(fs, rev, pool));
-}
-
-const char *
-path_p2l_index(svn_fs_t *fs,
-               svn_revnum_t rev,
-               apr_pool_t *pool)
-{
-  return apr_psprintf(pool, "%s" PATH_EXT_P2L_INDEX,
-                      svn_fs_fs__path_rev_absolute(fs, rev, pool));
-}
-
-const char *
 svn_fs_fs__path_rev_absolute(svn_fs_t *fs,
                              svn_revnum_t rev,
                              apr_pool_t *pool)
@@ -307,24 +271,6 @@ path_txn_props(svn_fs_t *fs,
   return svn_dirent_join(path_txn_dir(fs, txn_id, pool), PATH_TXN_PROPS, pool);
 }
 
-const char*
-path_l2p_proto_index(svn_fs_t *fs,
-                     const svn_fs_fs__id_part_t *txn_id,
-                     apr_pool_t *pool)
-{
-  return svn_dirent_join(path_txn_dir(fs, txn_id, pool),
-                         PATH_INDEX PATH_EXT_L2P_INDEX, pool);
-}
-
-const char*
-path_p2l_proto_index(svn_fs_t *fs,
-                     const svn_fs_fs__id_part_t *txn_id,
-                     apr_pool_t *pool)
-{
-  return svn_dirent_join(path_txn_dir(fs, txn_id, pool),
-                         PATH_INDEX PATH_EXT_P2L_INDEX, pool);
-}
-
 const char *
 path_txn_next_ids(svn_fs_t *fs,
                   const svn_fs_fs__id_part_t *txn_id,
@@ -340,15 +286,6 @@ path_min_unpacked_rev(svn_fs_t *fs, apr_
 }
 
 const char *
-path_txn_item_index(svn_fs_t *fs,
-                    const svn_fs_fs__id_part_t *txn_id,
-                    apr_pool_t *pool)
-{
-  return svn_dirent_join(path_txn_dir(fs, txn_id, pool),
-                         PATH_TXN_ITEM_INDEX, pool);
-}
-
-const char *
 path_txn_proto_rev(svn_fs_t *fs,
                    const svn_fs_fs__id_part_t *txn_id,
                    apr_pool_t *pool)

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/util.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/util.h?rev=1499139&r1=1499138&r2=1499139&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/util.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/util.h Tue Jul  2 22:46:46 2013
@@ -78,15 +78,6 @@ svn_boolean_t
 is_packed_revprop(svn_fs_t *fs,
                   svn_revnum_t rev);
 
-/* Return the revision number of the pack / rev file in FS containing REV. */
-svn_revnum_t
-packed_base_rev(svn_fs_t *fs, svn_revnum_t rev);
-
-/* Return the number of revisions in the pack / rev file in FS that contains
- * revision REV. */
-svn_revnum_t
-pack_size(svn_fs_t *fs, svn_revnum_t rev);
-
 const char *
 path_format(svn_fs_t *fs,
             apr_pool_t *pool);
@@ -128,16 +119,6 @@ path_rev(svn_fs_t *fs,
          apr_pool_t *pool);
 
 const char *
-path_l2p_index(svn_fs_t *fs,
-               svn_revnum_t rev,
-               apr_pool_t *pool);
-
-const char *
-path_p2l_index(svn_fs_t *fs,
-               svn_revnum_t rev,
-               apr_pool_t *pool);
-
-const char *
 path_revprops_shard(svn_fs_t *fs,
                     svn_revnum_t rev,
                     apr_pool_t *pool);
@@ -171,16 +152,6 @@ path_txn_changes(svn_fs_t *fs,
                  const svn_fs_fs__id_part_t *txn_id,
                  apr_pool_t *pool);
 
-const char*
-path_l2p_proto_index(svn_fs_t *fs,
-                     const svn_fs_fs__id_part_t *txn_id,
-                     apr_pool_t *pool);
-
-const char*
-path_p2l_proto_index(svn_fs_t *fs,
-                     const svn_fs_fs__id_part_t *txn_id,
-                     apr_pool_t *pool);
-
 const char *
 path_txn_props(svn_fs_t *fs,
                const svn_fs_fs__id_part_t *txn_id,
@@ -197,11 +168,6 @@ path_min_unpacked_rev(svn_fs_t *fs,
 
 
 const char *
-path_txn_item_index(svn_fs_t *fs,
-                    const svn_fs_fs__id_part_t *txn_id,
-                    apr_pool_t *pool);
-
-const char *
 path_txn_proto_rev(svn_fs_t *fs,
                    const svn_fs_fs__id_part_t *txn_id,
                    apr_pool_t *pool);



Mime
View raw message