From e039be5838a6befdb4a378fcdc1fc2e7606d4222 Mon Sep 17 00:00:00 2001 From: Jon Trowbridge Date: Fri, 9 Apr 2004 19:50:29 +0000 Subject: 2004-04-09 Jon Trowbridge * 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. --- bus/bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bus/bus.c') diff --git a/bus/bus.c b/bus/bus.c index 803a6584..0b3c934d 100644 --- a/bus/bus.c +++ b/bus/bus.c @@ -283,7 +283,7 @@ bus_context_new (const DBusString *config_file, context = NULL; auth_mechanisms = NULL; - parser = bus_config_load (config_file, TRUE, error); + parser = bus_config_load (config_file, TRUE, NULL, error); if (parser == NULL) goto failed; -- cgit