From 399da01ae4eb5c5e3e9349bacc2063c946c3d4a1 Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Tue, 11 Aug 2009 11:17:23 +0000 Subject: Merge the branches/struggleyb/libdom-remain back to trunk. svn path=/trunk/dom/; revision=9191 --- src/bootstrap/init_fini.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/bootstrap/init_fini.c') 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 #include +#include -#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; } -- cgit v1.2.3