2004-04-09 Jon Trowbridge <trow@ximian.com>
authorJon Trowbridge <trow@ximian.com>
Fri, 9 Apr 2004 19:50:29 +0000 (19:50 +0000)
committerJon Trowbridge <trow@ximian.com>
Fri, 9 Apr 2004 19:50:29 +0000 (19:50 +0000)
commite039be5838a6befdb4a378fcdc1fc2e7606d4222
treef3f4a33480ee755422819c1572298a354551a737
parent8056390e00ca6576323d6c41a4dc725bcba9b527
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.
12 files changed:
ChangeLog
bus/bus.c
bus/config-loader-expat.c
bus/config-loader-libxml.c
bus/config-parser.c
bus/config-parser.h
test/data/equiv-config-files/basic/basic-1.conf [new file with mode: 0644]
test/data/equiv-config-files/basic/basic-2.conf [new file with mode: 0644]
test/data/equiv-config-files/basic/basic.d/basic.conf [new file with mode: 0644]
test/data/equiv-config-files/entities/basic.d/basic.conf [new file with mode: 0644]
test/data/equiv-config-files/entities/entities-1.conf [new file with mode: 0644]
test/data/equiv-config-files/entities/entities-2.conf [new file with mode: 0644]