diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2011-09-15 22:31:16 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-09-15 22:31:16 +0000 |
commit | 3d71da088b83c2cc5741dfdc8f619fbf2bba55a2 (patch) | |
tree | 8c26b93479c4a23b657c55809ea823f7b2bc2ca5 /render/html.c | |
parent | 50508a6e75e8bfa955b9193f0b6252ff2e235220 (diff) | |
download | netsurf-3d71da088b83c2cc5741dfdc8f619fbf2bba55a2.tar.gz netsurf-3d71da088b83c2cc5741dfdc8f619fbf2bba55a2.tar.bz2 |
Clean up content_factory_register_handler API -- content handlers no longer use the mime type, so don't require it to be interned up front
svn path=/trunk/netsurf/; revision=12796
Diffstat (limited to 'render/html.c')
-rw-r--r-- | render/html.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/render/html.c b/render/html.c index 13f8d84b5..5378480c5 100644 --- a/render/html.c +++ b/render/html.c @@ -145,7 +145,6 @@ static const char *html_types[] = { "text/html" }; -static lwc_string *html_mime_types[NOF_ELEMENTS(html_types)]; static lwc_string *html_charset; nserror html_init(void) @@ -160,16 +159,8 @@ nserror html_init(void) goto error; } - for (i = 0; i < NOF_ELEMENTS(html_mime_types); i++) { - lerror = lwc_intern_string(html_types[i], - strlen(html_types[i]), - &html_mime_types[i]); - if (lerror != lwc_error_ok) { - error = NSERROR_NOMEM; - goto error; - } - - error = content_factory_register_handler(html_mime_types[i], + for (i = 0; i < NOF_ELEMENTS(html_types); i++) { + error = content_factory_register_handler(html_types[i], &html_content_handler); if (error != NSERROR_OK) goto error; @@ -185,15 +176,10 @@ error: void html_fini(void) { - uint32_t i; - - for (i = 0; i < NOF_ELEMENTS(html_mime_types); i++) { - if (html_mime_types[i] != NULL) - lwc_string_unref(html_mime_types[i]); - } - - if (html_charset != NULL) + if (html_charset != NULL) { lwc_string_unref(html_charset); + html_charset = NULL; + } } /** |