diff options
Diffstat (limited to 'render')
| -rw-r--r-- | render/html.c | 19 | ||||
| -rw-r--r-- | render/html_forms.c | 3 |
2 files changed, 8 insertions, 14 deletions
diff --git a/render/html.c b/render/html.c index 8526ca001..3ee85b419 100644 --- a/render/html.c +++ b/render/html.c @@ -335,10 +335,10 @@ html_create_html_data(html_content *c, const http_parameter *params) c->parser = dom_hubbub_parser_create(c->encoding, true, nsoption_bool(enable_javascript), - &c->document, NULL, html_process_script, - c); + c, + &c->document); if ((c->parser == NULL) && (c->encoding != NULL)) { /* Ok, we don't support the declared encoding. Bailing out * isn't exactly user-friendly, so fall back to autodetect */ @@ -348,12 +348,10 @@ html_create_html_data(html_content *c, const http_parameter *params) c->parser = dom_hubbub_parser_create(c->encoding, true, nsoption_bool(enable_javascript), - &c->document, NULL, html_process_script, - c); - - + c, + &c->document); } if (c->parser == NULL) { @@ -451,10 +449,10 @@ html_process_encoding_change(struct content *c, html->parser = dom_hubbub_parser_create(html->encoding, true, nsoption_bool(enable_javascript), - &html->document, NULL, html_process_script, - html); + html, + &html->document); if (html->parser == NULL) { /* Ok, we don't support the declared encoding. Bailing out * isn't exactly user-friendly, so fall back to Windows-1252 */ @@ -471,11 +469,10 @@ html_process_encoding_change(struct content *c, html->parser = dom_hubbub_parser_create(html->encoding, true, nsoption_bool(enable_javascript), - &html->document, - NULL, html_process_script, - html); + html, + &html->document); if (html->parser == NULL) { union content_msg_data msg_data; diff --git a/render/html_forms.c b/render/html_forms.c index 9ae8138d6..fc2bcaf8a 100644 --- a/render/html_forms.c +++ b/render/html_forms.c @@ -468,9 +468,6 @@ struct form_control *html_forms_get_control_for_node(struct form *forms, dom_nod dom_exception err; dom_string *ds_name = NULL; - if (forms == NULL) - return NULL; - /* Step one, see if we already have a control */ for (f = forms; f != NULL; f = f->prev) { for (ctl = f->controls; ctl != NULL; ctl = ctl->next) { |