You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/12/03 13:18:47 UTC
svn commit: r1041782 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Author: julianfoad
Date: Fri Dec 3 12:18:46 2010
New Revision: 1041782
URL: http://svn.apache.org/viewvc?rev=1041782&view=rev
Log:
Use existing helper functions to achieve a tiny simplification.
* subversion/libsvn_fs_fs/fs_fs.c
(recover_body): Use path_min_unpacked_revprop().
(pack_body): Use path_format(), path_min_unpacked_rev(),
path_min_unpacked_revprop().
Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1041782&r1=1041781&r2=1041782&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Fri Dec 3 12:18:46 2010
@@ -6966,11 +6966,10 @@ recover_body(void *baton, apr_pool_t *po
if (ffd->format >= SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT)
{
svn_revnum_t min_unpacked_revprop;
- const char *min_unpacked_revprop_path =
- svn_dirent_join(fs->path, PATH_MIN_UNPACKED_REVPROP, pool);
SVN_ERR(read_min_unpacked_rev(&min_unpacked_revprop,
- min_unpacked_revprop_path, pool));
+ path_min_unpacked_revprop(fs, pool),
+ pool));
if (min_unpacked_revprop == (max_rev + 1))
uhohs = FALSE;
}
@@ -7734,8 +7733,7 @@ pack_body(void *baton,
svn_revnum_t min_unpacked_rev;
svn_revnum_t min_unpacked_revprop;
- SVN_ERR(read_format(&format, &max_files_per_dir,
- svn_dirent_join(pb->fs->path, PATH_FORMAT, pool),
+ SVN_ERR(read_format(&format, &max_files_per_dir, path_format(pb->fs, pool),
pool));
/* If the repository isn't a new enough format, we don't support packing.
@@ -7750,16 +7748,13 @@ pack_body(void *baton,
return SVN_NO_ERROR;
SVN_ERR(read_min_unpacked_rev(&min_unpacked_rev,
- svn_dirent_join(pb->fs->path,
- PATH_MIN_UNPACKED_REV, pool),
+ path_min_unpacked_rev(pb->fs, pool),
pool));
if (format >= SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT)
{
SVN_ERR(read_min_unpacked_rev(&min_unpacked_revprop,
- svn_dirent_join(pb->fs->path,
- PATH_MIN_UNPACKED_REVPROP,
- pool),
+ path_min_unpacked_revprop(pb->fs, pool),
pool));
}
else