diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2019-05-05 22:46:40 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2019-05-05 22:50:25 +0100 |
| commit | 35bc2ccbb89a6b499e0e3b6f7095afea214f0c59 (patch) | |
| tree | cd494ae1e33ab55d0e644d11eb973ddde4decbb6 /content/handlers/html | |
| parent | f966580d22d47ab97bceb2f067fc2b9402af01b7 (diff) | |
| download | netsurf-35bc2ccbb89a6b499e0e3b6f7095afea214f0c59.tar.gz netsurf-35bc2ccbb89a6b499e0e3b6f7095afea214f0c59.tar.bz2 | |
change content get_source_data interfaces to return uint8_t and size_t
previously these interfaces returned char * and unsigned int which was
undesirable.
Diffstat (limited to 'content/handlers/html')
| -rw-r--r-- | content/handlers/html/html.c | 6 | ||||
| -rw-r--r-- | content/handlers/html/html_script.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/content/handlers/html/html.c b/content/handlers/html/html.c index 4ffdb396a..a7fea6dfe 100644 --- a/content/handlers/html/html.c +++ b/content/handlers/html/html.c @@ -1114,8 +1114,8 @@ html_process_encoding_change(struct content *c, dom_hubbub_parser_params parse_params; dom_hubbub_error error; const char *encoding; - const char *source_data; - unsigned long source_size; + const uint8_t *source_data; + size_t source_size; /* Retrieve new encoding */ encoding = dom_hubbub_parser_get_encoding(html->parser, @@ -1181,7 +1181,7 @@ html_process_encoding_change(struct content *c, * it cannot be changed again. */ error = dom_hubbub_parser_parse_chunk(html->parser, - (const uint8_t *)source_data, + source_data, source_size); return libdom_hubbub_error_to_nserror(error); diff --git a/content/handlers/html/html_script.c b/content/handlers/html/html_script.c index 1affb767c..203dc5089 100644 --- a/content/handlers/html/html_script.c +++ b/content/handlers/html/html_script.c @@ -42,7 +42,7 @@ #include "html/html.h" #include "html/html_internal.h" -typedef bool (script_handler_t)(struct jscontext *jscontext, const char *data, size_t size, const char *name); +typedef bool (script_handler_t)(struct jscontext *jscontext, const uint8_t *data, size_t size, const char *name); static script_handler_t *select_script_handler(content_type ctype) @@ -90,8 +90,8 @@ nserror html_script_exec(html_content *c, bool allow_defer) if (content_get_status(s->data.handle) == CONTENT_STATUS_DONE) { /* external script is now available */ - const char *data; - unsigned long size; + const uint8_t *data; + size_t size; data = content_get_source_data( s->data.handle, &size ); script_handler(c->jscontext, data, size, @@ -305,8 +305,8 @@ convert_script_sync_cb(hlcache_handle *script, script_handler = select_script_handler(content_get_type(s->data.handle)); if (script_handler != NULL && parent->jscontext != NULL) { /* script has a handler */ - const char *data; - unsigned long size; + const uint8_t *data; + size_t size; data = content_get_source_data(s->data.handle, &size ); script_handler(parent->jscontext, data, size, nsurl_access(hlcache_handle_get_url(s->data.handle))); @@ -532,7 +532,7 @@ exec_inline_script(html_content *c, dom_node *node, dom_string *mimetype) if (script_handler != NULL) { script_handler(c->jscontext, - dom_string_data(script), + (const uint8_t *)dom_string_data(script), dom_string_byte_length(script), "?inline script?"); } |