From 83f3338663c4969eebefd8c2c43bd3fc43587fdd Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Wed, 21 Dec 2011 22:18:10 +0000 Subject: Merge branches/jmb/dom-alloc-purge back to trunk svn path=/trunk/libdom/; revision=13316 --- src/core/entity_ref.h | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to 'src/core/entity_ref.h') diff --git a/src/core/entity_ref.h b/src/core/entity_ref.h index b83765c..015cef7 100644 --- a/src/core/entity_ref.h +++ b/src/core/entity_ref.h @@ -11,35 +11,26 @@ #include #include -struct dom_document; -struct dom_entity_reference; -struct lwc_string_s; +dom_exception _dom_entity_reference_create(dom_document *doc, + dom_string *name, dom_string *value, + dom_entity_reference **result); -dom_exception _dom_entity_reference_create(struct dom_document *doc, - struct lwc_string_s *name, dom_string *value, - struct dom_entity_reference **result); - -void _dom_entity_reference_destroy(struct dom_document *doc, - struct dom_entity_reference *entity); +void _dom_entity_reference_destroy(dom_entity_reference *entity); #define _dom_entity_reference_initialise _dom_node_initialise #define _dom_entity_reference_finalise _dom_node_finalise /* Following comes the protected vtable */ -void _dom_er_destroy(struct dom_node_internal *node); -dom_exception _dom_er_alloc(struct dom_document *doc, - struct dom_node_internal *n, struct dom_node_internal **ret); -dom_exception _dom_er_copy(struct dom_node_internal *new, - struct dom_node_internal *old); +void _dom_er_destroy(dom_node_internal *node); +dom_exception _dom_er_copy(dom_node_internal *old, dom_node_internal **copy); #define DOM_ER_PROTECT_VTABLE \ _dom_er_destroy, \ - _dom_er_alloc, \ _dom_er_copy /* Helper functions */ dom_exception _dom_entity_reference_get_textual_representation( - struct dom_entity_reference *entity, + dom_entity_reference *entity, dom_string **result); #endif -- cgit v1.2.3