diff options
author | Bo Yang <struggleyb.nku@gmail.com> | 2009-08-11 11:17:23 +0000 |
---|---|---|
committer | Bo Yang <struggleyb.nku@gmail.com> | 2009-08-11 11:17:23 +0000 |
commit | 399da01ae4eb5c5e3e9349bacc2063c946c3d4a1 (patch) | |
tree | 433c8bcde94fc7a6e6f2e5cbf23842a84db98146 /src/bootstrap/init_fini.c | |
parent | eec057c7437e19b59ca1e698ce548cb56ce37240 (diff) | |
download | libdom-399da01ae4eb5c5e3e9349bacc2063c946c3d4a1.tar.gz libdom-399da01ae4eb5c5e3e9349bacc2063c946c3d4a1.tar.bz2 |
Merge the branches/struggleyb/libdom-remain back to trunk.
svn path=/trunk/dom/; revision=9191
Diffstat (limited to 'src/bootstrap/init_fini.c')
-rw-r--r-- | src/bootstrap/init_fini.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/bootstrap/init_fini.c b/src/bootstrap/init_fini.c index a5a62a1..f3c7290 100644 --- a/src/bootstrap/init_fini.c +++ b/src/bootstrap/init_fini.c @@ -8,9 +8,10 @@ #include <stdbool.h> #include <dom/bootstrap/init_fini.h> +#include <dom/bootstrap/implregistry.h> -#include "core/document.h" #include "utils/namespace.h" +#include "bootstrap/implementation.h" static bool __initialised; @@ -32,16 +33,21 @@ dom_exception dom_initialise(dom_alloc alloc, void *pw) return DOM_NO_ERR; } - err = _dom_document_initialise(alloc, pw); + err = _dom_namespace_initialise(alloc, pw); if (err != DOM_NO_ERR) { return err; } - err = _dom_namespace_initialise(alloc, pw); + err = dom_implregistry_initialise(alloc, pw); if (err != DOM_NO_ERR) { return err; } + err = _dom_implementation_initialise(alloc, pw); + if (err != DOM_NO_ERR) { + return err; + } + __initialised = true; return DOM_NO_ERR; @@ -63,12 +69,9 @@ dom_exception dom_finalise(void) return DOM_NO_ERR; } - err = _dom_namespace_finalise(); - if (err != DOM_NO_ERR) { - return err; - } + _dom_implementation_finalise(); - err = _dom_document_finalise(); + err = _dom_namespace_finalise(); if (err != DOM_NO_ERR) { return err; } |