Warnings.squash();
svn path=/trunk/netsurf/; revision=5088
This commit is contained in:
parent
905fa1f624
commit
9e68e32338
|
@ -81,7 +81,7 @@ bool nsjpeg_convert(struct content *c, int w, int h)
|
||||||
unsigned int height;
|
unsigned int height;
|
||||||
unsigned int width;
|
unsigned int width;
|
||||||
struct bitmap *bitmap = NULL;
|
struct bitmap *bitmap = NULL;
|
||||||
char *pixels = NULL;
|
uint8_t *pixels = NULL;
|
||||||
size_t rowstride;
|
size_t rowstride;
|
||||||
union content_msg_data msg_data;
|
union content_msg_data msg_data;
|
||||||
|
|
||||||
|
|
|
@ -202,7 +202,7 @@ mng_bool nsmng_closestream(mng_handle mng) {
|
||||||
mng_bool nsmng_processheader(mng_handle mng, mng_uint32 width, mng_uint32 height) {
|
mng_bool nsmng_processheader(mng_handle mng, mng_uint32 width, mng_uint32 height) {
|
||||||
struct content *c;
|
struct content *c;
|
||||||
union content_msg_data msg_data;
|
union content_msg_data msg_data;
|
||||||
char *buffer;
|
uint8_t *buffer;
|
||||||
|
|
||||||
assert(mng != NULL);
|
assert(mng != NULL);
|
||||||
|
|
||||||
|
|
|
@ -103,7 +103,8 @@ bool directory_convert(struct content *c, int width, int height) {
|
||||||
#ifndef WITH_HUBBUB
|
#ifndef WITH_HUBBUB
|
||||||
htmlParseChunk(c->data.html.parser, buffer, strlen(buffer), 0);
|
htmlParseChunk(c->data.html.parser, buffer, strlen(buffer), 0);
|
||||||
#else
|
#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
|
#endif
|
||||||
|
|
||||||
res = url_parent(c->url, &up);
|
res = url_parent(c->url, &up);
|
||||||
|
@ -117,7 +118,8 @@ bool directory_convert(struct content *c, int width, int height) {
|
||||||
strlen(buffer), 0);
|
strlen(buffer), 0);
|
||||||
#else
|
#else
|
||||||
hubbub_parser_parse_chunk(c->data.html.parser,
|
hubbub_parser_parse_chunk(c->data.html.parser,
|
||||||
buffer, strlen(buffer));
|
(uint8_t *) buffer,
|
||||||
|
strlen(buffer));
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
free(up);
|
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);
|
htmlParseChunk(c->data.html.parser, buffer, strlen(buffer), 0);
|
||||||
#else
|
#else
|
||||||
hubbub_parser_parse_chunk(c->data.html.parser,
|
hubbub_parser_parse_chunk(c->data.html.parser,
|
||||||
buffer, strlen(buffer));
|
(uint8_t *) buffer, strlen(buffer));
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
closedir(parent);
|
closedir(parent);
|
||||||
|
|
|
@ -600,7 +600,8 @@ bool html_process_data(struct content *c, char *data, unsigned int size)
|
||||||
for (x = 0; x + CHUNK <= size; x += CHUNK) {
|
for (x = 0; x + CHUNK <= size; x += CHUNK) {
|
||||||
#ifdef WITH_HUBBUB
|
#ifdef WITH_HUBBUB
|
||||||
err = hubbub_parser_parse_chunk(
|
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) {
|
if (err == HUBBUB_ENCODINGCHANGE) {
|
||||||
goto encoding_change;
|
goto encoding_change;
|
||||||
}
|
}
|
||||||
|
@ -612,7 +613,8 @@ bool html_process_data(struct content *c, char *data, unsigned int size)
|
||||||
|
|
||||||
#ifdef WITH_HUBBUB
|
#ifdef WITH_HUBBUB
|
||||||
err = hubbub_parser_parse_chunk(
|
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) {
|
if (err == HUBBUB_ENCODINGCHANGE) {
|
||||||
goto encoding_change;
|
goto encoding_change;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue