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 | aba54ed61e31df318abdfa165f971a11ce084608 (patch) | |
tree | 433c8bcde94fc7a6e6f2e5cbf23842a84db98146 /src/core/implementation.c | |
parent | 4a8212d783b6d848ac5e23b2a5151caf19ce0a4f (diff) | |
download | libdom-aba54ed61e31df318abdfa165f971a11ce084608.tar.gz libdom-aba54ed61e31df318abdfa165f971a11ce084608.tar.bz2 |
Merge the branches/struggleyb/libdom-remain back to trunk.
svn path=/trunk/dom/; revision=9191
Diffstat (limited to 'src/core/implementation.c')
-rw-r--r-- | src/core/implementation.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/src/core/implementation.c b/src/core/implementation.c index e37b27d..e2b6763 100644 --- a/src/core/implementation.c +++ b/src/core/implementation.c @@ -59,8 +59,6 @@ dom_exception dom_implementation_has_feature( * \param public_id The external subset public identifier * \param system_id The external subset system identifier * \param doctype Pointer to location to receive result - * \param alloc Memory (de)allocation function - * \param pw Pointer to client-specific private data * \return DOM_NO_ERR on success, * DOM_INVALID_CHARACTER_ERR if ::qname is invalid, * DOM_NAMESPACE_ERR if ::qname is malformed, @@ -79,11 +77,11 @@ dom_exception dom_implementation_has_feature( dom_exception dom_implementation_create_document_type( struct dom_implementation *impl, struct dom_string *qname, struct dom_string *public_id, struct dom_string *system_id, - struct dom_document_type **doctype, - dom_alloc alloc, void *pw) + dom_alloc alloc, void *pw, struct lwc_context_s *ctx, + struct dom_document_type **doctype) { return impl->create_document_type(impl, qname, public_id, system_id, - doctype, alloc, pw); + alloc, pw, ctx, doctype); } /** @@ -94,8 +92,6 @@ dom_exception dom_implementation_create_document_type( * \param qname The qualified name of the document element * \param doctype The type of document to create * \param doc Pointer to location to receive result - * \param alloc Memory (de)allocation function - * \param pw Pointer to client-specific private data * \return DOM_NO_ERR on success, * DOM_INVALID_CHARACTER_ERR if ::qname is invalid, * DOM_NAMESPACE_ERR if ::qname is malformed, or if ::qname @@ -125,11 +121,11 @@ dom_exception dom_implementation_create_document( struct dom_implementation *impl, struct dom_string *namespace, struct dom_string *qname, struct dom_document_type *doctype, - struct dom_document **doc, - dom_alloc alloc, void *pw) + dom_alloc alloc, void *pw, struct lwc_context_s *ctx, + struct dom_document **doc) { - return impl->create_document(impl, namespace, qname, doctype, doc, - alloc, pw); + return impl->create_document(impl, namespace, qname, doctype, alloc, + pw, ctx, doc); } /** @@ -140,8 +136,6 @@ dom_exception dom_implementation_create_document( * \param feature The requested feature * \param version The version number of the feature * \param object Pointer to location to receive object - * \param alloc Memory (de)allocation function - * \param pw Pointer to client-specific private data * \return DOM_NO_ERR. * * Any memory allocated by this call should be allocated using @@ -150,8 +144,7 @@ dom_exception dom_implementation_create_document( dom_exception dom_implementation_get_feature( struct dom_implementation *impl, struct dom_string *feature, struct dom_string *version, - void **object, - dom_alloc alloc, void *pw) + void **object) { - return impl->get_feature(impl, feature, version, object, alloc, pw); + return impl->get_feature(impl, feature, version, object); } |