On Friday 11 February 2011 07:06 PM, Kamesh Jayachandran wrote:
Thanks Arwin. Committed at r1069791.
With regards
Kamesh Jayachandran
Here is the follow-up patch that fixes the deprecated calls of
svn_config_read.
Regards,
Arwin Arni
Index: subversion/libsvn_subr/config.c
===================================================================
--- subversion/libsvn_subr/config.c (revision 1069799)
+++ subversion/libsvn_subr/config.c (working copy)
@@ -159,7 +159,7 @@
#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 @@
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 @@
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 @@
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 @@
### 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);
Index: subversion/tests/libsvn_subr/cache-test.c
===================================================================
--- subversion/tests/libsvn_subr/cache-test.c (revision 1069799)
+++ subversion/tests/libsvn_subr/cache-test.c (working copy)
@@ -169,7 +169,8 @@
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 @@
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));
}
Index: subversion/tests/libsvn_subr/config-test.c
===================================================================
--- subversion/tests/libsvn_subr/config-test.c (revision 1069799)
+++ subversion/tests/libsvn_subr/config-test.c (working copy)
@@ -109,7 +109,7 @@
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 @@
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 @@
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");
Index: subversion/svnserve/serve.c
===================================================================
--- subversion/svnserve/serve.c (revision 1069799)
+++ subversion/svnserve/serve.c (working copy)
@@ -235,7 +235,7 @@
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 @@
{
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)
Index: subversion/libsvn_fs_fs/fs_fs.c
===================================================================
--- subversion/libsvn_fs_fs/fs_fs.c (revision 1069799)
+++ subversion/libsvn_fs_fs/fs_fs.c (working copy)
@@ -1074,9 +1074,9 @@
{
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)
Foolw-up to r1069791. Fix deprecated calls of svn_config_read.
* subversion/libsvn_subr/config.c
(read_all,
svn_config_merge) : Fixed callers.
* subversion/tests/libsvn_subr/cache-test.c
(test_memcache_basic,
test_memcache_longkey): Fixed callers.
* subversion/tests/libsvn_subr/config-test.c
(test_text_retrieval,
test_boolean_retrieval,
test_has_section) : Fixed callers.
* subversion/svnserve/serve.c
(load_configs) : Fixed callers.
* subversion/libsvn_fs_fs/fs_fs.c
(read_config) : Fixed callers.
Patch by: Arwin Arni <arwin{_AT_}collab.net>
