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/html/html_document.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/html/html_document.c') diff --git a/src/html/html_document.c b/src/html/html_document.c index 6b9eb5c..0022e0d 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -6,6 +6,7 @@ */ #include +#include #include "html/html_document.h" @@ -13,29 +14,24 @@ #include "utils/utils.h" /* Create a HTMLDocument */ -dom_exception dom_html_document_create(dom_alloc alloc, void *pw, dom_msg msg, - void *msg_pw, +dom_exception dom_html_document_create(dom_msg msg, void *msg_pw, dom_events_default_action_fetcher daf, dom_ui_handler *ui, dom_parser_type pt, dom_html_document **doc) { - assert(alloc != NULL); - *doc = alloc(NULL, sizeof(dom_html_document), pw); + *doc = malloc(sizeof(dom_html_document)); if (*doc == NULL) return DOM_NO_MEM_ERR; - return _dom_html_document_initialise(*doc, alloc, pw, msg, msg_pw, - daf, ui, pt); + return _dom_html_document_initialise(*doc, msg, msg_pw, daf, ui, pt); } /* Initialise a HTMLDocument */ dom_exception _dom_html_document_initialise(dom_html_document *doc, - dom_alloc alloc, void *pw, dom_msg msg, void *msg_pw, + dom_msg msg, void *msg_pw, dom_events_default_action_fetcher daf, dom_ui_handler *ui, dom_parser_type pt) { UNUSED(doc); - UNUSED(alloc); - UNUSED(pw); UNUSED(msg); UNUSED(msg_pw); UNUSED(daf); -- cgit v1.2.3