From 9e68e32338513c358ae168f4be1c5ffdf4e4de87 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Wed, 13 Aug 2008 14:11:05 +0000 Subject: Warnings.squash(); svn path=/trunk/netsurf/; revision=5088 --- image/jpeg.c | 2 +- image/mng.c | 2 +- render/directory.c | 8 +++++--- render/html.c | 6 ++++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/image/jpeg.c b/image/jpeg.c index ec2e62899..d49d49a4c 100644 --- a/image/jpeg.c +++ b/image/jpeg.c @@ -81,7 +81,7 @@ bool nsjpeg_convert(struct content *c, int w, int h) unsigned int height; unsigned int width; struct bitmap *bitmap = NULL; - char *pixels = NULL; + uint8_t *pixels = NULL; size_t rowstride; union content_msg_data msg_data; diff --git a/image/mng.c b/image/mng.c index d6902f4e9..fe0804976 100644 --- a/image/mng.c +++ b/image/mng.c @@ -202,7 +202,7 @@ mng_bool nsmng_closestream(mng_handle mng) { mng_bool nsmng_processheader(mng_handle mng, mng_uint32 width, mng_uint32 height) { struct content *c; union content_msg_data msg_data; - char *buffer; + uint8_t *buffer; assert(mng != NULL); diff --git a/render/directory.c b/render/directory.c index 754449df5..1363ad251 100644 --- a/render/directory.c +++ b/render/directory.c @@ -103,7 +103,8 @@ bool directory_convert(struct content *c, int width, int height) { #ifndef WITH_HUBBUB htmlParseChunk(c->data.html.parser, buffer, strlen(buffer), 0); #else - hubbub_parser_parse_chunk(c->data.html.parser, buffer, strlen(buffer)); + hubbub_parser_parse_chunk(c->data.html.parser, + (uint8_t *) buffer, strlen(buffer)); #endif res = url_parent(c->url, &up); @@ -117,7 +118,8 @@ bool directory_convert(struct content *c, int width, int height) { strlen(buffer), 0); #else hubbub_parser_parse_chunk(c->data.html.parser, - buffer, strlen(buffer)); + (uint8_t *) buffer, + strlen(buffer)); #endif } free(up); @@ -139,7 +141,7 @@ bool directory_convert(struct content *c, int width, int height) { htmlParseChunk(c->data.html.parser, buffer, strlen(buffer), 0); #else hubbub_parser_parse_chunk(c->data.html.parser, - buffer, strlen(buffer)); + (uint8_t *) buffer, strlen(buffer)); #endif } closedir(parent); diff --git a/render/html.c b/render/html.c index 7df0816e6..b15c7eb93 100644 --- a/render/html.c +++ b/render/html.c @@ -600,7 +600,8 @@ bool html_process_data(struct content *c, char *data, unsigned int size) for (x = 0; x + CHUNK <= size; x += CHUNK) { #ifdef WITH_HUBBUB err = hubbub_parser_parse_chunk( - c->data.html.parser, data + x, CHUNK); + c->data.html.parser, + (uint8_t *) data + x, CHUNK); if (err == HUBBUB_ENCODINGCHANGE) { goto encoding_change; } @@ -612,7 +613,8 @@ bool html_process_data(struct content *c, char *data, unsigned int size) #ifdef WITH_HUBBUB err = hubbub_parser_parse_chunk( - c->data.html.parser, data + x, (size - x)); + c->data.html.parser, + (uint8_t *) data + x, (size - x)); if (err == HUBBUB_ENCODINGCHANGE) { goto encoding_change; } -- cgit v1.2.3