lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-23 01:52:48 +03:00
Code Activity

added initialisation for ctxt->vctxt in HTMLInitParser (bug 133127) minor

Browse Source 
* HTMLparser.c: added initialisation for ctxt->vctxt
  in HTMLInitParser (bug 133127)
* valid.c: minor cosmetic change (removed ATTRIBUTE_UNUSED
  from several function params)
This commit is contained in:
William M. Brack
2004-02-06 07:36:04 +00:00
parent b2d25dd760
commit edb65a7ad0
3 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
Fri Feb 6 15:28:36 HKT 2004 William Brack <wbrack@mmm.com.hk>
* HTMLparser.c: added initialisation for ctxt->vctxt
in HTMLInitParser (bug 133127)
* valid.c: minor cosmetic change (removed ATTRIBUTE_UNUSED
from several function params)
Tue Feb 3 16:48:57 PST 2004 William Brack <wbrack@mmm.com.hk> Tue Feb 3 16:48:57 PST 2004 William Brack <wbrack@mmm.com.hk>
* xinclude.c: fixed problem regarding freeing of dictionary * xinclude.c: fixed problem regarding freeing of dictionary

7
HTMLparser.c
View File

@@ -64,7 +64,7 @@ static void htmlParseComment(htmlParserCtxtPtr ctxt);
************************************************************************/ ************************************************************************/
/** /**
* xmlErrMemory: * htmlErrMemory:
* @ctxt: an HTML parser context * @ctxt: an HTML parser context
* @extra: extra informations * @extra: extra informations
* *
@@ -3893,7 +3893,7 @@ htmlParseDocument(htmlParserCtxtPtr ctxt) {
************************************************************************/ ************************************************************************/
/** /**
* xmlInitParserCtxt: * htmlInitParserCtxt:
* @ctxt: an HTML parser context * @ctxt: an HTML parser context
* *
* Initialize a parser context * Initialize a parser context
@@ -3986,6 +3986,9 @@ htmlInitParserCtxt(htmlParserCtxtPtr ctxt)
ctxt->replaceEntities = 0; ctxt->replaceEntities = 0;
ctxt->linenumbers = xmlLineNumbersDefaultValue; ctxt->linenumbers = xmlLineNumbersDefaultValue;
ctxt->html = 1; ctxt->html = 1;
ctxt->vctxt.userData = ctxt;
ctxt->vctxt.error = xmlParserValidityError;
ctxt->vctxt.warning = xmlParserValidityWarning;
ctxt->record_info = 0; ctxt->record_info = 0;
ctxt->validate = 0; ctxt->validate = 0;
ctxt->nbChars = 0; ctxt->nbChars = 0;

25
valid.c
View File

@@ -132,7 +132,6 @@ xmlErrValidNodeNr(xmlValidCtxtPtr ctxt,
channel = ctxt->error; channel = ctxt->error;
data = ctxt->userData; data = ctxt->userData;
pctxt = ctxt->userData; pctxt = ctxt->userData;
pctxt = ctxt->userData;
} }
__xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_VALID, error, __xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_VALID, error,
XML_ERR_ERROR, NULL, 0, XML_ERR_ERROR, NULL, 0,
@@ -152,7 +151,7 @@ xmlErrValidNodeNr(xmlValidCtxtPtr ctxt,
* Handle a validation error, provide contextual informations * Handle a validation error, provide contextual informations
*/ */
static void static void
xmlErrValidNode(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED, xmlErrValidNode(xmlValidCtxtPtr ctxt,
xmlNodePtr node, xmlParserErrors error, xmlNodePtr node, xmlParserErrors error,
const char *msg, const xmlChar * str1, const char *msg, const xmlChar * str1,
const xmlChar * str2, const xmlChar * str3) const xmlChar * str2, const xmlChar * str3)
@@ -166,7 +165,6 @@ xmlErrValidNode(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED,
channel = ctxt->error; channel = ctxt->error;
data = ctxt->userData; data = ctxt->userData;
pctxt = ctxt->userData; pctxt = ctxt->userData;
pctxt = ctxt->userData;
} }
__xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_VALID, error, __xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_VALID, error,
XML_ERR_ERROR, NULL, 0, XML_ERR_ERROR, NULL, 0,
@@ -179,14 +177,14 @@ xmlErrValidNode(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED,
* @ctxt: an XML validation parser context * @ctxt: an XML validation parser context
* @node: the node raising the error * @node: the node raising the error
* @error: the error number * @error: the error number
* @str1: extra informations * @str1: extra information
* @str2: extra informations * @str2: extra information
* @str3: extra informations * @str3: extra information
* *
* Handle a validation error, provide contextual informations * Handle a validation error, provide contextual information
*/ */
static void static void
xmlErrValidWarning(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED, xmlErrValidWarning(xmlValidCtxtPtr ctxt,
xmlNodePtr node, xmlParserErrors error, xmlNodePtr node, xmlParserErrors error,
const char *msg, const xmlChar * str1, const char *msg, const xmlChar * str1,
const xmlChar * str2, const xmlChar * str3) const xmlChar * str2, const xmlChar * str3)
@@ -200,7 +198,6 @@ xmlErrValidWarning(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED,
channel = ctxt->error; channel = ctxt->error;
data = ctxt->userData; data = ctxt->userData;
pctxt = ctxt->userData; pctxt = ctxt->userData;
pctxt = ctxt->userData;
} }
__xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_VALID, error, __xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_VALID, error,
XML_ERR_WARNING, NULL, 0, XML_ERR_WARNING, NULL, 0,
@@ -1219,7 +1216,7 @@ xmlFreeElement(xmlElementPtr elem) {
* Returns NULL if not, otherwise the entity * Returns NULL if not, otherwise the entity
*/ */
xmlElementPtr xmlElementPtr
xmlAddElementDecl(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED, xmlAddElementDecl(xmlValidCtxtPtr ctxt,
xmlDtdPtr dtd, const xmlChar *name, xmlDtdPtr dtd, const xmlChar *name,
xmlElementTypeVal type, xmlElementTypeVal type,
xmlElementContentPtr content) { xmlElementContentPtr content) {
@@ -1777,7 +1774,7 @@ xmlFreeAttribute(xmlAttributePtr attr) {
* Returns NULL if not new, otherwise the attribute decl * Returns NULL if not new, otherwise the attribute decl
*/ */
xmlAttributePtr xmlAttributePtr
xmlAddAttributeDecl(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED, xmlAddAttributeDecl(xmlValidCtxtPtr ctxt,
xmlDtdPtr dtd, const xmlChar *elem, xmlDtdPtr dtd, const xmlChar *elem,
const xmlChar *name, const xmlChar *ns, const xmlChar *name, const xmlChar *ns,
xmlAttributeType type, xmlAttributeDefault def, xmlAttributeType type, xmlAttributeDefault def,
@@ -2183,7 +2180,7 @@ xmlFreeNotation(xmlNotationPtr nota) {
* Returns NULL if not, otherwise the entity * Returns NULL if not, otherwise the entity
*/ */
xmlNotationPtr xmlNotationPtr
xmlAddNotationDecl(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED, xmlDtdPtr dtd, xmlAddNotationDecl(xmlValidCtxtPtr ctxt, xmlDtdPtr dtd,
const xmlChar *name, const xmlChar *name,
const xmlChar *PublicID, const xmlChar *SystemID) { const xmlChar *PublicID, const xmlChar *SystemID) {
xmlNotationPtr ret; xmlNotationPtr ret;
@@ -2729,7 +2726,7 @@ xmlWalkRemoveRef(const void *data, const void *user)
* Returns NULL if not, otherwise the new xmlRefPtr * Returns NULL if not, otherwise the new xmlRefPtr
*/ */
xmlRefPtr xmlRefPtr
xmlAddRef(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED, xmlDocPtr doc, const xmlChar *value, xmlAddRef(xmlValidCtxtPtr ctxt, xmlDocPtr doc, const xmlChar *value,
xmlAttrPtr attr) { xmlAttrPtr attr) {
xmlRefPtr ret; xmlRefPtr ret;
xmlRefTablePtr table; xmlRefTablePtr table;
@@ -5267,7 +5264,7 @@ done:
* Returns 1 if yes, 0 if no, -1 in case of error * Returns 1 if yes, 0 if no, -1 in case of error
*/ */
static int static int
xmlValidateCheckMixed(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED, xmlValidateCheckMixed(xmlValidCtxtPtr ctxt,
xmlElementContentPtr cont, const xmlChar *qname) { xmlElementContentPtr cont, const xmlChar *qname) {
const xmlChar *name; const xmlChar *name;
int plen; int plen;