summaryrefslogtreecommitdiff
path: root/subversion/libsvn_subr/config_impl.h
diff options
context:
space:
mode:
Diffstat (limited to 'subversion/libsvn_subr/config_impl.h')
-rw-r--r--subversion/libsvn_subr/config_impl.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/subversion/libsvn_subr/config_impl.h b/subversion/libsvn_subr/config_impl.h
index a3ab8fa..529d7d5 100644
--- a/subversion/libsvn_subr/config_impl.h
+++ b/subversion/libsvn_subr/config_impl.h
@@ -34,7 +34,6 @@
#include "svn_string.h"
#include "svn_io.h"
#include "svn_config.h"
-#include "svn_private_config.h"
#ifdef __cplusplus
extern "C" {
@@ -47,7 +46,8 @@ struct svn_config_t
/* Table of cfg_section_t's. */
apr_hash_t *sections;
- /* Pool for hash tables, table entries and unexpanded values */
+ /* Pool for hash tables, table entries and unexpanded values.
+ Also, parent pool for temporary pools. */
apr_pool_t *pool;
/* Pool for expanded values -- this is separate, so that we can
@@ -70,8 +70,11 @@ struct svn_config_t
/* Specifies whether option names are populated case sensitively. */
svn_boolean_t option_names_case_sensitive;
-};
+ /* When set, all modification attempts will be ignored.
+ * In debug mode, we will trigger an assertion. */
+ svn_boolean_t read_only;
+};
/* Read sections and options from a file. */
svn_error_t *svn_config__parse_file(svn_config_t *cfg,
@@ -92,8 +95,9 @@ svn_error_t *svn_config__parse_stream(svn_config_t *cfg,
#ifdef WIN32
/* Get the common or user-specific AppData folder */
svn_error_t *svn_config__win_config_path(const char **folder,
- int system_path,
- apr_pool_t *pool);
+ svn_boolean_t system_path,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
/* Read sections and options from the Windows Registry. */
svn_error_t *svn_config__parse_registry(svn_config_t *cfg,