Author: stefan2
Date: Fri Feb 27 22:57:30 2015
New Revision: 1662847
URL: http://svn.apache.org/r1662847
Log:
On the fsx-1.10 branch:
Make a function static that is no longer called from other modules.
* subversion/libsvn_fs_x/rev_file.h
(svn_fs_x__auto_read_footer): Remove declaration here.
* subversion/libsvn_fs_x/rev_file.c
(svn_fs_x__auto_read_footer): Rename to ...
(auto_read_footer): ... this and make it static.
(svn_fs_x__rev_file_l2p_index,
svn_fs_x__rev_file_p2l_index,
svn_fs_x__rev_file_l2p_info,
svn_fs_x__rev_file_p2l_info): Update callers.
Modified:
subversion/branches/fsx-1.10/subversion/libsvn_fs_x/rev_file.c
subversion/branches/fsx-1.10/subversion/libsvn_fs_x/rev_file.h
Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/rev_file.c
URL:
http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/rev_file.c?rev=1662847&r1=1662846&r2=1662847&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/rev_file.c (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/rev_file.c Fri Feb 27
22:57:30 2015
@@ -230,8 +230,13 @@ svn_fs_x__open_pack_or_rev_file_writable
result_pool, scratch_pool));
}
-svn_error_t *
-svn_fs_x__auto_read_footer(svn_fs_x__revision_file_t *file)
+/* If the footer data in FILE has not been read, yet, do so now.
+ * Index locations will only be read upon request as we assume they get
+ * cached and the FILE is usually used for REP data access only.
+ * Hence, the separate step.
+ */
+static svn_error_t *
+auto_read_footer(svn_fs_x__revision_file_t *file)
{
if (file->l2p_info.start == -1)
{
@@ -309,7 +314,7 @@ svn_fs_x__rev_file_l2p_index(svn_fs_x__p
{
if (file->l2p_stream == NULL)
{
- SVN_ERR(svn_fs_x__auto_read_footer(file));
+ SVN_ERR(auto_read_footer(file));
SVN_ERR(svn_fs_x__packed_stream_open(&file->l2p_stream,
file->file,
file->l2p_info.start,
@@ -330,7 +335,7 @@ svn_fs_x__rev_file_p2l_index(svn_fs_x__p
{
if (file->p2l_stream== NULL)
{
- SVN_ERR(svn_fs_x__auto_read_footer(file));
+ SVN_ERR(auto_read_footer(file));
SVN_ERR(svn_fs_x__packed_stream_open(&file->p2l_stream,
file->file,
file->p2l_info.start,
@@ -349,7 +354,7 @@ svn_error_t *
svn_fs_x__rev_file_l2p_info(svn_fs_x__index_info_t *info,
svn_fs_x__revision_file_t *file)
{
- SVN_ERR(svn_fs_x__auto_read_footer(file));
+ SVN_ERR(auto_read_footer(file));
*info = file->l2p_info;
return SVN_NO_ERROR;
@@ -359,7 +364,7 @@ svn_error_t *
svn_fs_x__rev_file_p2l_info(svn_fs_x__index_info_t *info,
svn_fs_x__revision_file_t *file)
{
- SVN_ERR(svn_fs_x__auto_read_footer(file));
+ SVN_ERR(auto_read_footer(file));
*info = file->p2l_info;
return SVN_NO_ERROR;
Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/rev_file.h
URL:
http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/rev_file.h?rev=1662847&r1=1662846&r2=1662847&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/rev_file.h (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/rev_file.h Fri Feb 27
22:57:30 2015
@@ -119,14 +119,6 @@ svn_fs_x__open_pack_or_rev_file_writable
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* If the footer data in FILE has not been read, yet, do so now.
- * Index locations will only be read upon request as we assume they get
- * cached and the FILE is usually used for REP data access only.
- * Hence, the separate step.
- */
-svn_error_t *
-svn_fs_x__auto_read_footer(svn_fs_x__revision_file_t *file);
-
/* Open the proto-rev file of transaction TXN_ID in FS and return it in *FILE.
* Allocate *FILE in RESULT_POOL use and SCRATCH_POOL for temporaries.. */
svn_error_t *
