diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2007-09-29 01:41:23 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2007-09-29 01:41:23 +0000 |
commit | 01f9dc3a2fb3f6bfbb4dab27304371dd3c6345f4 (patch) | |
tree | ff2739087c040f4872adef4a3d0b3731f04ebea3 /src | |
parent | f83f65025b74f585f75db1a056f7a2fe4e215b69 (diff) | |
download | libdom-01f9dc3a2fb3f6bfbb4dab27304371dd3c6345f4.tar.gz libdom-01f9dc3a2fb3f6bfbb4dab27304371dd3c6345f4.tar.bz2 |
dom_initialise() and dom_finalise() are now completely public, rather than hidden away in a header only meant for inclusion by bindings. Client applications are responsible for initialisation and finalisation of the dom library. This must happen before/after (respectively) any call to a dom library or dom binding library function.
The reason for this change is that, if multiple bindings are required, then the dom library should still only be initialised/finalised once. Only the client can enforce this sensibly.
svn path=/trunk/dom/; revision=3606
Diffstat (limited to 'src')
-rw-r--r-- | src/bootstrap/init_fini.c | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/src/bootstrap/init_fini.c b/src/bootstrap/init_fini.c index 001eaf9..001e798 100644 --- a/src/bootstrap/init_fini.c +++ b/src/bootstrap/init_fini.c @@ -5,10 +5,14 @@ * Copyright 2007 John-Mark Bell <jmb@netsurf-browser.org> */ -#include <dom/bootstrap/implpriv.h> +#include <stdbool.h> + +#include <dom/bootstrap/init_fini.h> #include "utils/namespace.h" +static bool __initialised; + /** * Initialise the dom library * @@ -16,15 +20,23 @@ * \param pw Pointer to client-specific private data * \return DOM_NO_ERR on success. * - * This should be invoked by the binding's initialiser and must be - * the first DOM library method called. + * This must be the first DOM library method called. */ dom_exception dom_initialise(dom_alloc alloc, void *pw) { dom_exception err; + /* Ensure we only initialise once */ + if (__initialised) { + return DOM_NO_ERR; + } + err = _dom_namespace_initialise(alloc, pw); + if (err == DOM_NO_ERR) { + __initialised = true; + } + return err; } @@ -33,15 +45,21 @@ dom_exception dom_initialise(dom_alloc alloc, void *pw) * * \return DOM_NO_ERR on success. * - * This should be invoked by the binding's finaliser and must be - * the last DOM library method called. + * This must be the last DOM library method called. */ dom_exception dom_finalise(void) { dom_exception err; + /* Ensure we only finalise once */ + if (__initialised == false) { + return DOM_NO_ERR; + } + err = _dom_namespace_finalise(); + __initialised = false; + return err; } |