diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2010-04-03 16:37:36 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2010-04-03 16:37:36 +0000 |
commit | 43a99ab683d14c4a11d5fbeaef90d68c84e345fb (patch) | |
tree | cd0a593404904b27fb92b98b5cc600b495f6e465 | |
parent | 4839adaff307200236329b0c56dbc2b04e66edcb (diff) | |
download | netsurf-43a99ab683d14c4a11d5fbeaef90d68c84e345fb.tar.gz netsurf-43a99ab683d14c4a11d5fbeaef90d68c84e345fb.tar.bz2 |
Constify data parameter to *_process_data
svn path=/trunk/netsurf/; revision=10234
-rw-r--r-- | content/content.c | 5 | ||||
-rw-r--r-- | css/css.c | 4 | ||||
-rw-r--r-- | css/css.h | 4 | ||||
-rw-r--r-- | image/mng.c | 2 | ||||
-rw-r--r-- | image/mng.h | 2 | ||||
-rw-r--r-- | image/png.c | 2 | ||||
-rw-r--r-- | image/png.h | 2 | ||||
-rw-r--r-- | image/rsvg.c | 2 | ||||
-rw-r--r-- | image/rsvg.h | 2 | ||||
-rw-r--r-- | render/html.c | 8 | ||||
-rw-r--r-- | render/html.h | 2 | ||||
-rw-r--r-- | render/textplain.c | 3 | ||||
-rw-r--r-- | render/textplain.h | 3 |
13 files changed, 22 insertions, 19 deletions
diff --git a/content/content.c b/content/content.c index 782e1a370..9a33d964b 100644 --- a/content/content.c +++ b/content/content.c @@ -247,7 +247,8 @@ const char * const content_status_name[] = { /** An entry in handler_map. */ struct handler_entry { bool (*create)(struct content *c, const http_parameter *params); - bool (*process_data)(struct content *c, char *data, unsigned int size); + bool (*process_data)(struct content *c, + const char *data, unsigned int size); bool (*convert)(struct content *c); void (*reformat)(struct content *c, int width, int height); void (*destroy)(struct content *c); @@ -519,7 +520,7 @@ nserror content_llcache_callback(llcache_handle *llcache, case LLCACHE_EVENT_HAD_DATA: if (handler_map[c->type].process_data) { if (handler_map[c->type].process_data(c, - (char *) event->data.data.buf, + (const char *) event->data.data.buf, event->data.data.len) == false) { c->status = CONTENT_STATUS_ERROR; /** \todo It's not clear what error this is */ @@ -117,7 +117,7 @@ nserror nscss_create_css_data(struct content_css_data *c, * \param size Number of bytes to process * \return true on success, false on failure */ -bool nscss_process_data(struct content *c, char *data, unsigned int size) +bool nscss_process_data(struct content *c, const char *data, unsigned int size) { union content_msg_data msg_data; css_error error; @@ -139,7 +139,7 @@ bool nscss_process_data(struct content *c, char *data, unsigned int size) * \param size Number of bytes to process * \return CSS_OK on success, appropriate error otherwise */ -css_error nscss_process_css_data(struct content_css_data *c, char *data, +css_error nscss_process_css_data(struct content_css_data *c, const char *data, unsigned int size) { return css_stylesheet_append_data(c->sheet, @@ -51,7 +51,7 @@ struct nscss_import { bool nscss_create(struct content *c, const struct http_parameter *params); -bool nscss_process_data(struct content *c, char *data, unsigned int size); +bool nscss_process_data(struct content *c, const char *data, unsigned int size); bool nscss_convert(struct content *c); @@ -59,7 +59,7 @@ void nscss_destroy(struct content *c); nserror nscss_create_css_data(struct content_css_data *c, const char *url, const char *charset, bool quirks); -css_error nscss_process_css_data(struct content_css_data *c, char *data, +css_error nscss_process_css_data(struct content_css_data *c, const char *data, unsigned int size); css_error nscss_convert_css_data(struct content_css_data *c); void nscss_destroy_css_data(struct content_css_data *c); diff --git a/image/mng.c b/image/mng.c index 012301d98..5498d0528 100644 --- a/image/mng.c +++ b/image/mng.c @@ -267,7 +267,7 @@ mng_bool nsmng_processheader(mng_handle mng, mng_uint32 width, */ -bool nsmng_process_data(struct content *c, char *data, unsigned int size) +bool nsmng_process_data(struct content *c, const char *data, unsigned int size) { mng_retcode status; diff --git a/image/mng.h b/image/mng.h index fb822cf78..319d42059 100644 --- a/image/mng.h +++ b/image/mng.h @@ -42,7 +42,7 @@ struct content_mng_data { }; bool nsmng_create(struct content *c, const struct http_parameter *params); -bool nsmng_process_data(struct content *c, char *data, unsigned int size); +bool nsmng_process_data(struct content *c, const char *data, unsigned int size); bool nsmng_convert(struct content *c); void nsmng_destroy(struct content *c); bool nsmng_redraw(struct content *c, int x, int y, diff --git a/image/png.c b/image/png.c index 0cef6ec6a..f68c07cda 100644 --- a/image/png.c +++ b/image/png.c @@ -104,7 +104,7 @@ bool nspng_create(struct content *c, const struct http_parameter *params) } -bool nspng_process_data(struct content *c, char *data, unsigned int size) +bool nspng_process_data(struct content *c, const char *data, unsigned int size) { union content_msg_data msg_data; diff --git a/image/png.h b/image/png.h index 63056c8e4..253e685ad 100644 --- a/image/png.h +++ b/image/png.h @@ -43,7 +43,7 @@ struct content_png_data { }; bool nspng_create(struct content *c, const struct http_parameter *params); -bool nspng_process_data(struct content *c, char *data, unsigned int size); +bool nspng_process_data(struct content *c, const char *data, unsigned int size); bool nspng_convert(struct content *c); void nspng_destroy(struct content *c); bool nspng_redraw(struct content *c, int x, int y, diff --git a/image/rsvg.c b/image/rsvg.c index 058759425..c47e9a078 100644 --- a/image/rsvg.c +++ b/image/rsvg.c @@ -69,7 +69,7 @@ bool rsvg_create(struct content *c, const struct http_parameter *params) return true; } -bool rsvg_process_data(struct content *c, char *data, +bool rsvg_process_data(struct content *c, const char *data, unsigned int size) { struct content_rsvg_data *d = &c->data.rsvg; diff --git a/image/rsvg.h b/image/rsvg.h index 80b837220..0eeb3c9eb 100644 --- a/image/rsvg.h +++ b/image/rsvg.h @@ -43,7 +43,7 @@ struct content_rsvg_data { }; bool rsvg_create(struct content *c, const struct http_parameter *params); -bool rsvg_process_data(struct content *c, char *data, unsigned int size); +bool rsvg_process_data(struct content *c, const char *data, unsigned int size); bool rsvg_convert(struct content *c); void rsvg_destroy(struct content *c); bool rsvg_redraw(struct content *c, int x, int y, diff --git a/render/html.c b/render/html.c index ce34d5d63..e38a4ba99 100644 --- a/render/html.c +++ b/render/html.c @@ -192,7 +192,7 @@ error: * The data is parsed in chunks of size CHUNK, multitasking in between. */ -bool html_process_data(struct content *c, char *data, unsigned int size) +bool html_process_data(struct content *c, const char *data, unsigned int size) { unsigned long x; binding_error err; @@ -200,7 +200,7 @@ bool html_process_data(struct content *c, char *data, unsigned int size) for (x = 0; x + CHUNK <= size; x += CHUNK) { err = binding_parse_chunk(c->data.html.parser_binding, - (uint8_t *) data + x, CHUNK); + (const uint8_t *) data + x, CHUNK); if (err == BINDING_ENCODINGCHANGE) { goto encoding_change; } else if (err != BINDING_OK) { @@ -216,7 +216,7 @@ bool html_process_data(struct content *c, char *data, unsigned int size) } err = binding_parse_chunk(c->data.html.parser_binding, - (uint8_t *) data + x, (size - x)); + (const uint8_t *) data + x, (size - x)); if (err == BINDING_ENCODINGCHANGE) { goto encoding_change; } else if (err != BINDING_OK) { @@ -294,7 +294,7 @@ encoding_change: /* Recurse to reprocess all that data. This is safe because * the encoding is now specified at parser-start which means * it cannot be changed again. */ - return html_process_data(c, (char *) source_data, source_size); + return html_process_data(c, source_data, source_size); } } diff --git a/render/html.h b/render/html.h index f56cb585e..42d4ec163 100644 --- a/render/html.h +++ b/render/html.h @@ -186,7 +186,7 @@ extern bool html_redraw_debug; bool html_create(struct content *c, const struct http_parameter *params); -bool html_process_data(struct content *c, char *data, unsigned int size); +bool html_process_data(struct content *c, const char *data, unsigned int size); bool html_convert(struct content *c); void html_reformat(struct content *c, int width, int height); void html_destroy(struct content *c); diff --git a/render/textplain.c b/render/textplain.c index c259a8b07..8983fc2a9 100644 --- a/render/textplain.c +++ b/render/textplain.c @@ -133,7 +133,8 @@ no_memory: * Process data for CONTENT_TEXTPLAIN. */ -bool textplain_process_data(struct content *c, char *data, unsigned int size) +bool textplain_process_data(struct content *c, + const char *data, unsigned int size) { iconv_t iconv_cd = c->data.textplain.iconv_cd; size_t count; diff --git a/render/textplain.h b/render/textplain.h index 355695a4d..ec4882800 100644 --- a/render/textplain.h +++ b/render/textplain.h @@ -49,7 +49,8 @@ struct content_textplain_data { }; bool textplain_create(struct content *c, const struct http_parameter *params); -bool textplain_process_data(struct content *c, char *data, unsigned int size); +bool textplain_process_data(struct content *c, + const char *data, unsigned int size); bool textplain_convert(struct content *c); void textplain_reformat(struct content *c, int width, int height); void textplain_destroy(struct content *c); |