Author: julianfoad
Date: Tue Apr 16 12:33:08 2013
New Revision: 1468395
URL: http://svn.apache.org/r1468395
Log:
Introduce a typedef 'svn_fs_freeze_func_t', for source code regularity and
symmetry with 'svn_repos_freeze_func_t'. It might also be useful for the
SWIG bindings.
* subversion/include/svn_fs.h
(svn_fs_freeze_func_t): New typedef.
(svn_fs_freeze): Use it.
* subversion/libsvn_fs_base/fs.c
(base_bdb_freeze): Use it.
* subversion/libsvn_fs_fs/fs.c
(fs_freeze): Use it.
* subversion/libsvn_fs/fs-loader.c
(svn_fs_freeze): Use it.
* subversion/libsvn_fs/fs-loader.h
(fs_vtable_t): Use it.
Modified:
subversion/trunk/subversion/include/svn_fs.h
subversion/trunk/subversion/libsvn_fs/fs-loader.c
subversion/trunk/subversion/libsvn_fs/fs-loader.h
subversion/trunk/subversion/libsvn_fs_base/fs.c
subversion/trunk/subversion/libsvn_fs_fs/fs.c
Modified: subversion/trunk/subversion/include/svn_fs.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_fs.h?rev=1468395&r1=1468394&r2=1468395&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_fs.h (original)
+++ subversion/trunk/subversion/include/svn_fs.h Tue Apr 16 12:33:08 2013
@@ -419,6 +419,13 @@ svn_fs_recover(const char *path,
/**
+ * Callback for svn_fs_freeze().
+ *
+ * @since New in 1.8.
+ */
+typedef svn_error_t *(*svn_fs_freeze_func_t)(void *baton, apr_pool_t *pool);
+
+/**
* Take an exclusive lock on @a fs to prevent commits and then invoke
* @a freeze_func passing @a freeze_baton.
*
@@ -432,7 +439,7 @@ svn_fs_recover(const char *path,
*/
svn_error_t *
svn_fs_freeze(svn_fs_t *fs,
- svn_error_t *(*freeze_func)(void *baton, apr_pool_t *pool),
+ svn_fs_freeze_func_t freeze_func,
void *freeze_baton,
apr_pool_t *pool);
Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1468395&r1=1468394&r2=1468395&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Tue Apr 16 12:33:08 2013
@@ -644,7 +644,7 @@ svn_fs_verify_root(svn_fs_root_t *root,
svn_error_t *
svn_fs_freeze(svn_fs_t *fs,
- svn_error_t *(*freeze_func)(void *baton, apr_pool_t *pool),
+ svn_fs_freeze_func_t freeze_func,
void *freeze_baton,
apr_pool_t *pool)
{
Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.h?rev=1468395&r1=1468394&r2=1468395&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.h (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.h Tue Apr 16 12:33:08 2013
@@ -224,7 +224,7 @@ typedef struct fs_vtable_t
svn_error_t *(*verify_root)(svn_fs_root_t *root,
apr_pool_t *pool);
svn_error_t *(*freeze)(svn_fs_t *fs,
- svn_error_t *(*freeze_func)(void *, apr_pool_t *),
+ svn_fs_freeze_func_t freeze_func,
void *freeze_baton, apr_pool_t *pool);
svn_error_t *(*bdb_set_errcall)(svn_fs_t *fs,
void (*handler)(const char *errpfx,
Modified: subversion/trunk/subversion/libsvn_fs_base/fs.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/fs.c?rev=1468395&r1=1468394&r2=1468395&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/fs.c Tue Apr 16 12:33:08 2013
@@ -533,7 +533,7 @@ base_bdb_verify_root(svn_fs_root_t *root
static svn_error_t *
base_bdb_freeze(svn_fs_t *fs,
- svn_error_t *(*freeze_func)(void *, apr_pool_t *),
+ svn_fs_freeze_func_t freeze_func,
void *freeze_baton,
apr_pool_t *pool)
{
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs.c?rev=1468395&r1=1468394&r2=1468395&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs.c Tue Apr 16 12:33:08 2013
@@ -126,7 +126,7 @@ fs_set_errcall(svn_fs_t *fs,
struct fs_freeze_baton_t {
svn_fs_t *fs;
- svn_error_t *(*freeze_func)(void *, apr_pool_t *);
+ svn_fs_freeze_func_t freeze_func;
void *freeze_baton;
};
@@ -148,7 +148,7 @@ fs_freeze_body(void *baton,
static svn_error_t *
fs_freeze(svn_fs_t *fs,
- svn_error_t *(*freeze_func)(void *, apr_pool_t *),
+ svn_fs_freeze_func_t freeze_func,
void *freeze_baton,
apr_pool_t *pool)
{
