diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2011-12-21 22:18:10 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-12-21 22:18:10 +0000 |
commit | 83f3338663c4969eebefd8c2c43bd3fc43587fdd (patch) | |
tree | e48ba69628c5ba793533094e308c1fce9acb21aa /src/html/html_document.c | |
parent | 4ade8ad1c7b23e6eeeee6681acbdb43fb10cab43 (diff) | |
download | libdom-83f3338663c4969eebefd8c2c43bd3fc43587fdd.tar.gz libdom-83f3338663c4969eebefd8c2c43bd3fc43587fdd.tar.bz2 |
Merge branches/jmb/dom-alloc-purge back to trunk
svn path=/trunk/libdom/; revision=13316
Diffstat (limited to 'src/html/html_document.c')
-rw-r--r-- | src/html/html_document.c | 14 |
1 files changed, 5 insertions, 9 deletions
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 <assert.h> +#include <stdlib.h> #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); |