Fix warnings introduced by hubbub integration.
svn path=/trunk/netsurf/; revision=5022
This commit is contained in:
parent
7d482d33bf
commit
3a3f39e927
|
@ -713,6 +713,8 @@ encoding_change:
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef WITH_HUBBUB
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the HTML parser character encoding.
|
* Set the HTML parser character encoding.
|
||||||
*
|
*
|
||||||
|
@ -720,10 +722,8 @@ encoding_change:
|
||||||
* \param encoding name of encoding
|
* \param encoding name of encoding
|
||||||
* \return true on success, false on error and error reported
|
* \return true on success, false on error and error reported
|
||||||
*/
|
*/
|
||||||
|
|
||||||
bool html_set_parser_encoding(struct content *c, const char *encoding)
|
bool html_set_parser_encoding(struct content *c, const char *encoding)
|
||||||
{
|
{
|
||||||
#ifndef WITH_HUBBUB
|
|
||||||
struct content_html_data *html = &c->data.html;
|
struct content_html_data *html = &c->data.html;
|
||||||
xmlError *error;
|
xmlError *error;
|
||||||
char error_message[500];
|
char error_message[500];
|
||||||
|
@ -772,7 +772,6 @@ bool html_set_parser_encoding(struct content *c, const char *encoding)
|
||||||
|
|
||||||
/* Ensure noone else attempts to reset the encoding */
|
/* Ensure noone else attempts to reset the encoding */
|
||||||
html->getenc = false;
|
html->getenc = false;
|
||||||
#endif
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -839,6 +838,9 @@ const char *html_detect_encoding(const char **data, unsigned int *size)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert a CONTENT_HTML for display.
|
* Convert a CONTENT_HTML for display.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue