Author: stefan2
Date: Sun May 25 11:33:03 2014
New Revision: 1597414
URL: http://svn.apache.org/r1597414
Log:
Follow-up to r1589048:
Fix deprecation warnings by making fs_library_vtable_t.set_svn_fs_open
functions with svn_fs_open2-compatible signatures.
* subversion/libsvn_fs/fs-loader.h
(fs_library_vtable_t): Make set_svn_fs_open's svn_fs_open_ parameter
match svn_fs_open2 in signature.
* subversion/libsvn_fs_base/fs.c
(base_set_svn_fs_open): Update function signature.
* subversion/libsvn_fs_fs/fs.c
(fs_set_svn_fs_open): Same.
* subversion/libsvn_fs_x/fs.c
(x_set_svn_fs_open): Same.
* subversion/libsvn_fs_fs/fs.h
(fs_fs_data_t): Update the forwarding function pointer signature
to match svn_fs_open2 as well.
* subversion/libsvn_fs_x/fs.h
(fs_x_data_t): Same.
* subversion/libsvn_fs/fs-loader.c
(svn_fs_create,
svn_fs_open2,
svn_fs_create_berkeley,
svn_fs_open_berkeley): Fix the immediate deprecation warning by
using svn_fs_open2 instead of svn_fs_open.
* subversion/libsvn_fs_fs/transaction.c
(verify_as_revision_before_current_plus_plus): Update function call.
* subversion/libsvn_fs_x/transaction.c
(verify_as_revision_before_current_plus_plus): Same.
Modified:
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
subversion/trunk/subversion/libsvn_fs_fs/fs.h
subversion/trunk/subversion/libsvn_fs_fs/transaction.c
subversion/trunk/subversion/libsvn_fs_x/fs.c
subversion/trunk/subversion/libsvn_fs_x/fs.h
subversion/trunk/subversion/libsvn_fs_x/transaction.c
Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1597414&r1=1597413&r2=1597414&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Sun May 25 11:33:03 2014
@@ -499,7 +499,7 @@ svn_fs_create(svn_fs_t **fs_p, const cha
*fs_p = fs_new(fs_config, pool);
SVN_ERR(vtable->create(*fs_p, path, common_pool_lock, pool, common_pool));
- SVN_ERR(vtable->set_svn_fs_open(*fs_p, svn_fs_open));
+ SVN_ERR(vtable->set_svn_fs_open(*fs_p, svn_fs_open2));
return SVN_NO_ERROR;
}
@@ -515,7 +515,7 @@ svn_fs_open2(svn_fs_t **fs_p, const char
*fs_p = fs_new(fs_config, result_pool);
SVN_ERR(vtable->open_fs(*fs_p, path, common_pool_lock, scratch_pool,
common_pool));
- SVN_ERR(vtable->set_svn_fs_open(*fs_p, svn_fs_open));
+ SVN_ERR(vtable->set_svn_fs_open(*fs_p, svn_fs_open2));
return SVN_NO_ERROR;
}
@@ -749,7 +749,7 @@ svn_fs_create_berkeley(svn_fs_t *fs, con
/* Perform the actual creation. */
SVN_ERR(vtable->create(fs, path, common_pool_lock, fs->pool, common_pool));
- SVN_ERR(vtable->set_svn_fs_open(fs, svn_fs_open));
+ SVN_ERR(vtable->set_svn_fs_open(fs, svn_fs_open2));
return SVN_NO_ERROR;
}
@@ -761,7 +761,7 @@ svn_fs_open_berkeley(svn_fs_t *fs, const
SVN_ERR(fs_library_vtable(&vtable, path, fs->pool));
SVN_ERR(vtable->open_fs(fs, path, common_pool_lock, fs->pool, common_pool));
- SVN_ERR(vtable->set_svn_fs_open(fs, svn_fs_open));
+ SVN_ERR(vtable->set_svn_fs_open(fs, svn_fs_open2));
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.h?rev=1597414&r1=1597413&r2=1597414&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.h (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.h Sun May 25 11:33:03 2014
@@ -152,6 +152,7 @@ typedef struct fs_library_vtable_t
svn_error_t *(*svn_fs_open_)(svn_fs_t **,
const char *,
apr_hash_t *,
+ apr_pool_t *,
apr_pool_t *));
/* For svn_fs_info_fsfs_dup(). */
void *(*info_fsap_dup)(const void *fsap_info,
Modified: subversion/trunk/subversion/libsvn_fs_base/fs.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/fs.c?rev=1597414&r1=1597413&r2=1597414&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/fs.c Sun May 25 11:33:03 2014
@@ -1480,6 +1480,7 @@ base_set_svn_fs_open(svn_fs_t *fs,
svn_error_t *(*svn_fs_open_)(svn_fs_t **,
const char *,
apr_hash_t *,
+ apr_pool_t *,
apr_pool_t *))
{
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs.c?rev=1597414&r1=1597413&r2=1597414&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs.c Sun May 25 11:33:03 2014
@@ -459,6 +459,7 @@ fs_set_svn_fs_open(svn_fs_t *fs,
svn_error_t *(*svn_fs_open_)(svn_fs_t **,
const char *,
apr_hash_t *,
+ apr_pool_t *,
apr_pool_t *))
{
fs_fs_data_t *ffd = fs->fsap_data;
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs.h?rev=1597414&r1=1597413&r2=1597414&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs.h Sun May 25 11:33:03 2014
@@ -467,7 +467,7 @@ typedef struct fs_fs_data_t
/* Pointer to svn_fs_open. */
svn_error_t *(*svn_fs_open_)(svn_fs_t **, const char *, apr_hash_t *,
- apr_pool_t *);
+ apr_pool_t *, apr_pool_t *);
} fs_fs_data_t;
Modified: subversion/trunk/subversion/libsvn_fs_fs/transaction.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/transaction.c?rev=1597414&r1=1597413&r2=1597414&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/transaction.c Sun May 25 11:33:03
2014
@@ -3205,6 +3205,7 @@ verify_as_revision_before_current_plus_p
svn_uuid_generate(pool));
SVN_ERR(ffd->svn_fs_open_(&ft, fs->path,
fs_config,
+ pool,
pool));
ft_ffd = ft->fsap_data;
/* Don't let FT consult rep-cache.db, either. */
Modified: subversion/trunk/subversion/libsvn_fs_x/fs.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.c?rev=1597414&r1=1597413&r2=1597414&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.c Sun May 25 11:33:03 2014
@@ -465,6 +465,7 @@ x_set_svn_fs_open(svn_fs_t *fs,
svn_error_t *(*svn_fs_open_)(svn_fs_t **,
const char *,
apr_hash_t *,
+ apr_pool_t *,
apr_pool_t *))
{
fs_x_data_t *ffd = fs->fsap_data;
Modified: subversion/trunk/subversion/libsvn_fs_x/fs.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.h?rev=1597414&r1=1597413&r2=1597414&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.h Sun May 25 11:33:03 2014
@@ -411,7 +411,7 @@ typedef struct fs_x_data_t
/* Pointer to svn_fs_open. */
svn_error_t *(*svn_fs_open_)(svn_fs_t **, const char *, apr_hash_t *,
- apr_pool_t *);
+ apr_pool_t *, apr_pool_t *);
} fs_x_data_t;
Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1597414&r1=1597413&r2=1597414&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Sun May 25 11:33:03
2014
@@ -3084,6 +3084,7 @@ verify_as_revision_before_current_plus_p
svn_uuid_generate(pool));
SVN_ERR(ffd->svn_fs_open_(&ft, fs->path,
fs_config,
+ pool,
pool));
ft_ffd = ft->fsap_data;
/* Don't let FT consult rep-cache.db, either. */
