diff options
| author | Jon Trowbridge <trow@ximian.com> | 2004-04-09 19:50:29 +0000 |
|---|---|---|
| committer | Jon Trowbridge <trow@ximian.com> | 2004-04-09 19:50:29 +0000 |
| commit | e039be5838a6befdb4a378fcdc1fc2e7606d4222 (patch) | |
| tree | f3f4a33480ee755422819c1572298a354551a737 /bus/config-parser.h | |
| parent | 8056390e00ca6576323d6c41a4dc725bcba9b527 (diff) | |
2004-04-09 Jon Trowbridge <trow@ximian.com>
* bus/config-parser.c (bus_config_parser_new): Added a 'parent'
argument. If non-null, the newly-constructed BusConfigParser will
be initialized with the parent's BusLimits instead of the default
values.
(include_file): When including a config file, pass in
the current parser as the parent and then copy the BusLimits
from the included BusConfigParser pack to the current parser.
(process_test_valid_subdir): Renamed from process_test_subdir.
(process_test_equiv_subdir): Added. Walks through a directory,
descending into each subdirectory and loading the config files
it finds there. If any subdirectory contains two config files
that don't produce identical BusConfigParser structs, fail.
For now, the BusConfigParser's BusPolicies are not compared.
(bus_config_parser_test): Call both process_test_valid_subdir and
process_test_equiv_subdir.
* bus/config-loader-libxml.c (bus_config_load): Take a parent
argument and pass it along to the call to bus_config_parser_new.
Also made a few small changes to allow this code to compile.
* bus/config-loader-expat.c (bus_config_load): Take a parent
argument and pass it along to the call to bus_config_parser_new.
* bus/bus.c (bus_context_new): Load the config file
with a NULL parent argument.
Diffstat (limited to 'bus/config-parser.h')
| -rw-r--r-- | bus/config-parser.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/bus/config-parser.h b/bus/config-parser.h index 028ec430..a48eda19 100644 --- a/bus/config-parser.h +++ b/bus/config-parser.h @@ -35,8 +35,10 @@ typedef struct BusConfigParser BusConfigParser; -BusConfigParser* bus_config_parser_new (const DBusString *basedir, - dbus_bool_t is_toplevel); +BusConfigParser* bus_config_parser_new (const DBusString *basedir, + dbus_bool_t is_toplevel, + const BusConfigParser *parent); + BusConfigParser* bus_config_parser_ref (BusConfigParser *parser); void bus_config_parser_unref (BusConfigParser *parser); dbus_bool_t bus_config_parser_check_doctype (BusConfigParser *parser, @@ -71,9 +73,10 @@ void bus_config_parser_get_limits (BusConfigParser *parser, /* Loader functions (backended off one of the XML parsers). Returns a * finished ConfigParser. */ -BusConfigParser* bus_config_load (const DBusString *file, - dbus_bool_t is_toplevel, - DBusError *error); +BusConfigParser* bus_config_load (const DBusString *file, + dbus_bool_t is_toplevel, + const BusConfigParser *parent, + DBusError *error); #endif /* BUS_CONFIG_PARSER_H */ |