You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/01/13 02:16:13 UTC
svn commit: r1651255 - in /subversion/trunk/subversion/libsvn_fs_x: fs_x.h
lock.c rep-cache.c util.h
Author: stefan2
Date: Tue Jan 13 01:16:12 2015
New Revision: 1651255
URL: http://svn.apache.org/r1651255
Log:
In FSX, move path constructor function declarations from fs_x.h to util.h .
Their implementations are already in utils.c
* subversion/libsvn_fs_x/fs_x.h
(svn_fs_x__path_rev_absolute,
svn_fs_x__path_current): Move these declarations from here ...
* subversion/libsvn_fs_x/util.h
(svn_fs_x__path_rev_absolute,
svn_fs_x__path_current): ... to here.
* subversion/libsvn_fs_x/lock.c
* subversion/libsvn_fs_x/rep-cache.c
(): Add missing #include of the target header.
Modified:
subversion/trunk/subversion/libsvn_fs_x/fs_x.h
subversion/trunk/subversion/libsvn_fs_x/lock.c
subversion/trunk/subversion/libsvn_fs_x/rep-cache.c
subversion/trunk/subversion/libsvn_fs_x/util.h
Modified: subversion/trunk/subversion/libsvn_fs_x/fs_x.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs_x.h?rev=1651255&r1=1651254&r2=1651255&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs_x.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs_x.h Tue Jan 13 01:16:12 2015
@@ -160,25 +160,6 @@ svn_fs_x__set_uuid(svn_fs_t *fs,
const char *instance_id,
apr_pool_t *scratch_pool);
-/* Set *PATH to the path of REV in FS, whether in a pack file or not.
- Allocate *PATH in POOL.
-
- Note: If the caller does not have the write lock on FS, then the path is
- not guaranteed to be correct or to remain correct after the function
- returns, because the revision might become packed before or after this
- call. If a file exists at that path, then it is correct; if not, then
- the caller should call update_min_unpacked_rev() and re-try once. */
-const char *
-svn_fs_x__path_rev_absolute(svn_fs_t *fs,
- svn_revnum_t rev,
- apr_pool_t *pool);
-
-/* Return the path to the 'current' file in FS.
- Perform allocation in RESULT_POOL. */
-const char *
-svn_fs_x__path_current(svn_fs_t *fs,
- apr_pool_t *result_pool);
-
/* Read the format number and maximum number of files per directory
from PATH and return them in *PFORMAT and *MAX_FILES_PER_DIR
respectively.
Modified: subversion/trunk/subversion/libsvn_fs_x/lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/lock.c?rev=1651255&r1=1651254&r2=1651255&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/lock.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/lock.c Tue Jan 13 01:16:12 2015
@@ -37,6 +37,7 @@
#include "tree.h"
#include "fs_x.h"
#include "transaction.h"
+#include "util.h"
#include "../libsvn_fs/fs-loader.h"
#include "private/svn_fs_util.h"
Modified: subversion/trunk/subversion/libsvn_fs_x/rep-cache.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/rep-cache.c?rev=1651255&r1=1651254&r2=1651255&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/rep-cache.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/rep-cache.c Tue Jan 13 01:16:12 2015
@@ -27,6 +27,7 @@
#include "fs_x.h"
#include "fs.h"
#include "rep-cache.h"
+#include "util.h"
#include "../libsvn_fs/fs-loader.h"
#include "svn_path.h"
Modified: subversion/trunk/subversion/libsvn_fs_x/util.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/util.h?rev=1651255&r1=1651254&r2=1651255&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/util.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/util.h Tue Jan 13 01:16:12 2015
@@ -96,6 +96,12 @@ const char *
svn_fs_x__path_format(svn_fs_t *fs,
apr_pool_t *result_pool);
+/* Return the path to the 'current' file in FS.
+ Perform allocation in RESULT_POOL. */
+const char *
+svn_fs_x__path_current(svn_fs_t *fs,
+ apr_pool_t *result_pool);
+
/* Return the full path of the "uuid" file in FS.
* The result will be allocated in RESULT_POOL.
*/
@@ -164,6 +170,19 @@ svn_fs_x__path_rev(svn_fs_t *fs,
svn_revnum_t rev,
apr_pool_t *pool);
+/* Set *PATH to the path of REV in FS, whether in a pack file or not.
+ Allocate *PATH in POOL.
+
+ Note: If the caller does not have the write lock on FS, then the path is
+ not guaranteed to be correct or to remain correct after the function
+ returns, because the revision might become packed before or after this
+ call. If a file exists at that path, then it is correct; if not, then
+ the caller should call update_min_unpacked_rev() and re-try once. */
+const char *
+svn_fs_x__path_rev_absolute(svn_fs_t *fs,
+ svn_revnum_t rev,
+ apr_pool_t *pool);
+
/* Return the full path of the revision properties shard directory that
* will contain the properties of revision REV in FS.
* Allocate the result in POOL.