subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1161164 - in /subversion/branches/1.7.x-fs-verify/subversion: include/private/svn_fs_private.h include/svn_fs.h include/svn_repos.h libsvn_fs/fs-loader.c libsvn_repos/dump.c
Date Wed, 24 Aug 2011 15:41:56 GMT
Author: danielsh
Date: Wed Aug 24 15:41:55 2011
New Revision: 1161164

URL: http://svn.apache.org/viewvc?rev=1161164&view=rev
Log:
On the 1.7.x-fs-verify branch, make the new API private.

Suggested by: cmpilato

* subversion/include/svn_fs.h
  (svn_fs_verify): Move to..

* subversion/include/private/svn_fs_private.h
  (svn_fs__verify): .. here, renaming.

* subversion/libsvn_fs/fs-loader.c
  (svn_fs__verify, svn_fs_verify): Track rename.
  
* subversion/libsvn_repos/dump.c
  (svn_repos_verify_fs2): Track rename.

* subversion/include/svn_repos.h
  (svn_repos_dump_fs3): Remove reference to removed public API.

Modified:
    subversion/branches/1.7.x-fs-verify/subversion/include/private/svn_fs_private.h
    subversion/branches/1.7.x-fs-verify/subversion/include/svn_fs.h
    subversion/branches/1.7.x-fs-verify/subversion/include/svn_repos.h
    subversion/branches/1.7.x-fs-verify/subversion/libsvn_fs/fs-loader.c
    subversion/branches/1.7.x-fs-verify/subversion/libsvn_repos/dump.c

Modified: subversion/branches/1.7.x-fs-verify/subversion/include/private/svn_fs_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-fs-verify/subversion/include/private/svn_fs_private.h?rev=1161164&r1=1161163&r2=1161164&view=diff
==============================================================================
--- subversion/branches/1.7.x-fs-verify/subversion/include/private/svn_fs_private.h (original)
+++ subversion/branches/1.7.x-fs-verify/subversion/include/private/svn_fs_private.h Wed Aug
24 15:41:55 2011
@@ -67,6 +67,23 @@ svn_fs__access_get_lock_tokens(svn_fs_ac
 svn_error_t *
 svn_fs__path_valid(const char *path, apr_pool_t *pool);
 
+/**
+ * Perform backend-specific data consistency and correctness validations
+ * to the Subversion filesystem located in the directory @a path.
+ * Use @a pool for necessary allocations.
+ *
+ * @note You probably don't want to use this directly.  Take a look at
+ * svn_repos_verify_fs2() instead, which does non-backend-specific
+ * verifications as well.
+ *
+ * @since New in 1.7.
+ */
+svn_error_t *
+svn_fs__verify(const char *path,
+               svn_cancel_func_t cancel_func,
+               void *cancel_baton,
+               apr_pool_t *pool);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

Modified: subversion/branches/1.7.x-fs-verify/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-fs-verify/subversion/include/svn_fs.h?rev=1161164&r1=1161163&r2=1161164&view=diff
==============================================================================
--- subversion/branches/1.7.x-fs-verify/subversion/include/svn_fs.h (original)
+++ subversion/branches/1.7.x-fs-verify/subversion/include/svn_fs.h Wed Aug 24 15:41:55 2011
@@ -246,23 +246,6 @@ svn_fs_upgrade(const char *path,
                apr_pool_t *pool);
 
 /**
- * Perform backend-specific data consistency and correctness validations
- * to the Subversion filesystem located in the directory @a path.
- * Use @a pool for necessary allocations.
- *
- * @note You probably don't want to use this directly.  Take a look at
- * svn_repos_verify_fs2() instead, which does non-backend-specific
- * verifications as well.
- *
- * @since New in 1.8.
- */
-svn_error_t *
-svn_fs_verify(const char *path,
-              svn_cancel_func_t cancel_func,
-              void *cancel_baton,
-              apr_pool_t *pool);
-
-/**
  * Return, in @a *fs_type, a string identifying the back-end type of
  * the Subversion filesystem located in @a path.  Allocate @a *fs_type
  * in @a pool.

Modified: subversion/branches/1.7.x-fs-verify/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-fs-verify/subversion/include/svn_repos.h?rev=1161164&r1=1161163&r2=1161164&view=diff
==============================================================================
--- subversion/branches/1.7.x-fs-verify/subversion/include/svn_repos.h (original)
+++ subversion/branches/1.7.x-fs-verify/subversion/include/svn_repos.h Wed Aug 24 15:41:55
2011
@@ -2473,8 +2473,7 @@ svn_repos_verify_fs(svn_repos_t *repos,
  * writable @a dumpstream.  Begin at revision @a start_rev, and dump every
  * revision up through @a end_rev.  Use @a pool for all allocation.  If
  * non-@c NULL, send feedback to @a feedback_stream.  If @a dumpstream is
- * @c NULL, this is effectively a primitive verify.  It is not complete,
- * however; see svn_fs_verify instead.
+ * @c NULL, this is effectively a primitive verify.
  *
  * If @a start_rev is #SVN_INVALID_REVNUM, then start dumping at revision
  * 0.  If @a end_rev is #SVN_INVALID_REVNUM, then dump through the @c HEAD

Modified: subversion/branches/1.7.x-fs-verify/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-fs-verify/subversion/libsvn_fs/fs-loader.c?rev=1161164&r1=1161163&r2=1161164&view=diff
==============================================================================
--- subversion/branches/1.7.x-fs-verify/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/branches/1.7.x-fs-verify/subversion/libsvn_fs/fs-loader.c Wed Aug 24 15:41:55
2011
@@ -460,10 +460,10 @@ svn_fs_upgrade(const char *path, apr_poo
 }
 
 svn_error_t *
-svn_fs_verify(const char *path,
-              svn_cancel_func_t cancel_func,
-              void *cancel_baton,
-              apr_pool_t *pool) 
+svn_fs__verify(const char *path,
+               svn_cancel_func_t cancel_func,
+               void *cancel_baton,
+               apr_pool_t *pool) 
 {
   svn_error_t *err;
   svn_error_t *err2;

Modified: subversion/branches/1.7.x-fs-verify/subversion/libsvn_repos/dump.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-fs-verify/subversion/libsvn_repos/dump.c?rev=1161164&r1=1161163&r2=1161164&view=diff
==============================================================================
--- subversion/branches/1.7.x-fs-verify/subversion/libsvn_repos/dump.c (original)
+++ subversion/branches/1.7.x-fs-verify/subversion/libsvn_repos/dump.c Wed Aug 24 15:41:55
2011
@@ -1284,8 +1284,8 @@ svn_repos_verify_fs2(svn_repos_t *repos,
 
   /* Verify global/auxiliary data before verifying revisions. */
   if (start_rev == 0)
-    SVN_ERR(svn_fs_verify(svn_fs_path(fs, pool), cancel_func, cancel_baton,
-                          pool));
+    SVN_ERR(svn_fs__verify(svn_fs_path(fs, pool), cancel_func, cancel_baton,
+                           pool));
 
   /* Create a notify object that we can reuse within the loop. */
   if (notify_func)



Mime
View raw message