You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ka...@apache.org on 2011/02/11 15:44:13 UTC
svn commit: r1069821 - in /subversion/trunk/subversion: libsvn_fs_fs/fs_fs.c
libsvn_subr/config.c svnserve/serve.c tests/libsvn_subr/cache-test.c
tests/libsvn_subr/config-test.c
Author: kameshj
Date: Fri Feb 11 14:44:13 2011
New Revision: 1069821
URL: http://svn.apache.org/viewvc?rev=1069821&view=rev
Log:
Follow-up to r1069791. Fix deprecated calls of svn_config_read.
* subversion/libsvn_subr/config.c
(read_all, svn_config_merge):
* subversion/tests/libsvn_subr/cache-test.c
(test_memcache_basic, test_memcache_longkey):
* subversion/tests/libsvn_subr/config-test.c
(test_text_retrieval, test_boolean_retrieval, test_has_section):
* subversion/svnserve/serve.c
(load_configs):
* subversion/libsvn_fs_fs/fs_fs.c
(read_config):
Fixed callers.
Patch by: Arwin Arni <arwin{_AT_}collab.net>
Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
subversion/trunk/subversion/libsvn_subr/config.c
subversion/trunk/subversion/svnserve/serve.c
subversion/trunk/subversion/tests/libsvn_subr/cache-test.c
subversion/trunk/subversion/tests/libsvn_subr/config-test.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1069821&r1=1069820&r2=1069821&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Fri Feb 11 14:44:13 2011
@@ -1074,9 +1074,9 @@ read_config(svn_fs_t *fs,
{
fs_fs_data_t *ffd = fs->fsap_data;
- SVN_ERR(svn_config_read(&ffd->config,
- svn_dirent_join(fs->path, PATH_CONFIG, pool),
- FALSE, fs->pool));
+ SVN_ERR(svn_config_read2(&ffd->config,
+ svn_dirent_join(fs->path, PATH_CONFIG, pool),
+ FALSE, FALSE, fs->pool));
/* Initialize ffd->rep_sharing_allowed. */
if (ffd->format >= SVN_FS_FS__MIN_REP_SHARING_FORMAT)
Modified: subversion/trunk/subversion/libsvn_subr/config.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/config.c?rev=1069821&r1=1069820&r2=1069821&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/config.c (original)
+++ subversion/trunk/subversion/libsvn_subr/config.c Fri Feb 11 14:44:13 2011
@@ -159,7 +159,7 @@ read_all(svn_config_t **cfgp,
#ifdef WIN32
if (sys_registry_path)
{
- SVN_ERR(svn_config_read(cfgp, sys_registry_path, FALSE, pool));
+ SVN_ERR(svn_config_read2(cfgp, sys_registry_path, FALSE, FALSE, pool));
red_config = TRUE;
}
#endif /* WIN32 */
@@ -170,7 +170,7 @@ read_all(svn_config_t **cfgp,
SVN_ERR(svn_config_merge(*cfgp, sys_file_path, FALSE));
else
{
- SVN_ERR(svn_config_read(cfgp, sys_file_path, FALSE, pool));
+ SVN_ERR(svn_config_read2(cfgp, sys_file_path, FALSE, FALSE, pool));
red_config = TRUE;
}
}
@@ -184,7 +184,8 @@ read_all(svn_config_t **cfgp,
SVN_ERR(svn_config_merge(*cfgp, usr_registry_path, FALSE));
else
{
- SVN_ERR(svn_config_read(cfgp, usr_registry_path, FALSE, pool));
+ SVN_ERR(svn_config_read2(cfgp, usr_registry_path,
+ FALSE, FALSE, pool));
red_config = TRUE;
}
}
@@ -196,7 +197,7 @@ read_all(svn_config_t **cfgp,
SVN_ERR(svn_config_merge(*cfgp, usr_file_path, FALSE));
else
{
- SVN_ERR(svn_config_read(cfgp, usr_file_path, FALSE, pool));
+ SVN_ERR(svn_config_read2(cfgp, usr_file_path, FALSE, FALSE, pool));
red_config = TRUE;
}
}
@@ -332,7 +333,7 @@ svn_config_merge(svn_config_t *cfg, cons
### We could use a tmp subpool for this, since merge_cfg is going
to be tossed afterwards. Premature optimization, though? */
svn_config_t *merge_cfg;
- SVN_ERR(svn_config_read(&merge_cfg, file, must_exist, cfg->pool));
+ SVN_ERR(svn_config_read2(&merge_cfg, file, must_exist, FALSE, cfg->pool));
/* Now copy the new options into the original table. */
for_each_option(merge_cfg, cfg, merge_cfg->pool, merge_callback);
Modified: subversion/trunk/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=1069821&r1=1069820&r2=1069821&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/serve.c (original)
+++ subversion/trunk/subversion/svnserve/serve.c Fri Feb 11 14:44:13 2011
@@ -235,7 +235,7 @@ svn_error_t *load_configs(svn_config_t *
const char *pwdb_path, *authzdb_path;
svn_error_t *err;
- SVN_ERR(svn_config_read(cfg, filename, must_exist, pool));
+ SVN_ERR(svn_config_read2(cfg, filename, must_exist, FALSE, pool));
svn_config_get(*cfg, &pwdb_path, SVN_CONFIG_SECTION_GENERAL,
SVN_CONFIG_OPTION_PASSWORD_DB, NULL);
@@ -245,7 +245,7 @@ svn_error_t *load_configs(svn_config_t *
{
pwdb_path = svn_dirent_join(base, pwdb_path, pool);
- err = svn_config_read(pwdb, pwdb_path, TRUE, pool);
+ err = svn_config_read2(pwdb, pwdb_path, TRUE, FALSE, pool);
if (err)
{
if (server)
Modified: subversion/trunk/subversion/tests/libsvn_subr/cache-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/cache-test.c?rev=1069821&r1=1069820&r2=1069821&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/cache-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/cache-test.c Fri Feb 11 14:44:13 2011
@@ -169,7 +169,8 @@ test_memcache_basic(const svn_test_opts_
if (opts->config_file)
{
- SVN_ERR(svn_config_read(&config, opts->config_file, TRUE, pool));
+ SVN_ERR(svn_config_read2(&config, opts->config_file,
+ TRUE, FALSE, pool));
SVN_ERR(svn_cache__make_memcache_from_config(&memcache, config, pool));
}
@@ -215,7 +216,8 @@ test_memcache_long_key(const svn_test_op
if (opts->config_file)
{
- SVN_ERR(svn_config_read(&config, opts->config_file, TRUE, pool));
+ SVN_ERR(svn_config_read2(&config, opts->config_file,
+ TRUE, FALSE, pool));
SVN_ERR(svn_cache__make_memcache_from_config(&memcache, config, pool));
}
Modified: subversion/trunk/subversion/tests/libsvn_subr/config-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/config-test.c?rev=1069821&r1=1069820&r2=1069821&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/config-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/config-test.c Fri Feb 11 14:44:13 2011
@@ -109,7 +109,7 @@ test_text_retrieval(apr_pool_t *pool)
SVN_ERR(init_params(pool));
cfg_file = apr_pstrcat(pool, srcdir, "/", "config-test.cfg", (char *)NULL);
- SVN_ERR(svn_config_read(&cfg, cfg_file, TRUE, pool));
+ SVN_ERR(svn_config_read2(&cfg, cfg_file, TRUE, FALSE, pool));
/* Test values retrieved from our ConfigParser instance against
values retrieved using svn_config. */
@@ -160,7 +160,7 @@ test_boolean_retrieval(apr_pool_t *pool)
SVN_ERR(init_params(pool));
cfg_file = apr_pstrcat(pool, srcdir, "/", "config-test.cfg", (char *)NULL);
- SVN_ERR(svn_config_read(&cfg, cfg_file, TRUE, pool));
+ SVN_ERR(svn_config_read2(&cfg, cfg_file, TRUE, FALSE, pool));
for (i = 0; true_keys[i] != NULL; i++)
{
@@ -220,7 +220,7 @@ test_has_section(apr_pool_t *pool)
SVN_ERR(init_params(pool));
cfg_file = apr_pstrcat(pool, srcdir, "/", "config-test.cfg", (char *)NULL);
- SVN_ERR(svn_config_read(&cfg, cfg_file, TRUE, pool));
+ SVN_ERR(svn_config_read2(&cfg, cfg_file, TRUE, FALSE, pool));
if (! svn_config_has_section(cfg, "section1"))
return fail(pool, "Failed to find section1");