shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-03-19 14:50:07 +03:00
Code

last cleanup of error handling in the Relax-NG module. Daniel

Browse Source 
* relaxng.c include/libxml/xmlerror.h: last cleanup of error
  handling in the Relax-NG module.
Daniel
This commit is contained in:
Daniel Veillard 2003-10-07 12:17:44 +00:00
parent 4c00414711
commit 6edbfbbe66
3 changed files with 26 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Oct 7 14:16:45 CEST 2003 Daniel Veillard <daniel@veillard.com>
* relaxng.c include/libxml/xmlerror.h: last cleanup of error
handling in the Relax-NG module.
Tue Oct 7 13:30:39 CEST 2003 Daniel Veillard <daniel@veillard.com>
* error.c relaxng.c include/libxml/xmlerror.h: switched Relax-NG

2
include/libxml/xmlerror.h
View File

@ -272,6 +272,7 @@ typedef enum {
XML_RNGP_ELEM_CONTENT_ERROR,
XML_RNGP_ELEMENT_EMPTY,
XML_RNGP_ELEMENT_CONTENT,
XML_RNGP_ELEMENT_NAME,
XML_RNGP_ELEMENT_NO_CONTENT,
XML_RNGP_ELEM_TEXT_CONFLICT,
XML_RNGP_EMPTY,
@ -373,6 +374,7 @@ typedef enum {
XML_RNGP_URI_NOT_ABSOLUTE,
XML_RNGP_VALUE_EMPTY,
XML_RNGP_VALUE_NO_CONTENT,
XML_RNGP_XMLNS_NAME,
XML_RNGP_XML_NS
} xmlParserErrors;

112
relaxng.c
View File

@ -2156,74 +2156,6 @@ xmlRelaxNGGetErrorString(xmlRelaxNGValidErr err, const xmlChar * arg1,
return (xmlStrdup((xmlChar *) msg));
}
/**
* xmlRelaxNGValidErrorContext:
* @ctxt: the validation context
* @node: the node
* @child: the node child generating the problem.
*
* Dump informations about the kocation of the error in the instance
*/
static void
xmlRelaxNGValidErrorContext(xmlRelaxNGValidCtxtPtr ctxt, xmlNodePtr node,
xmlNodePtr child)
{
int line = 0;
const xmlChar *file = NULL;
const xmlChar *name = NULL;
const char *type = "error";
if ((ctxt == NULL) || (ctxt->error == NULL))
return;
if (child != NULL)
node = child;
if (node != NULL) {
if ((node->type == XML_DOCUMENT_NODE) ||
(node->type == XML_HTML_DOCUMENT_NODE)) {
xmlDocPtr doc = (xmlDocPtr) node;
file = doc->URL;
} else {
/*
* Try to find contextual informations to report
*/
if (node->type == XML_ELEMENT_NODE) {
line = (long) node->content;
} else if ((node->prev != NULL) &&
(node->prev->type == XML_ELEMENT_NODE)) {
line = (long) node->prev->content;
} else if ((node->parent != NULL) &&
(node->parent->type == XML_ELEMENT_NODE)) {
line = (long) node->parent->content;
}
if ((node->doc != NULL) && (node->doc->URL != NULL))
file = node->doc->URL;
if (node->name != NULL)
name = node->name;
}
}
type = "RNG validity error";
if ((file != NULL) && (line != 0) && (name != NULL))
ctxt->error(ctxt->userData, "%s: file %s line %d element %s\n",
type, file, line, name);
else if ((file != NULL) && (name != NULL))
ctxt->error(ctxt->userData, "%s: file %s element %s\n",
type, file, name);
else if ((file != NULL) && (line != 0))
ctxt->error(ctxt->userData, "%s: file %s line %d\n", type, file,
line);
else if (file != NULL)
ctxt->error(ctxt->userData, "%s: file %s\n", type, file);
else if (name != NULL)
ctxt->error(ctxt->userData, "%s: element %s\n", type, name);
else
ctxt->error(ctxt->userData, "%s\n", type);
}
/**
* xmlRelaxNGShowValidError:
* @ctxt: the validation context
@ -4840,16 +4772,14 @@ xmlRelaxNGParsePattern(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node)
xmlHashLookup(ctxt->grammar->refs, def->name);
if (prev == NULL) {
if (def->name != NULL) {
if (ctxt->error != NULL)
ctxt->error(ctxt->userData,
"Error refs definitions '%s'\n",
def->name);
xmlRngPErr(ctxt, node, XML_RNGP_REF_CREATE_FAILED,
"Error refs definitions '%s'\n",
def->name, NULL);
} else {
if (ctxt->error != NULL)
ctxt->error(ctxt->userData,
"Error refs definitions\n");
xmlRngPErr(ctxt, node, XML_RNGP_REF_CREATE_FAILED,
"Error refs definitions\n",
NULL, NULL);
}
ctxt->nbErrors++;
def = NULL;
} else {
def->nextHash = prev->nextHash;
@ -5184,16 +5114,14 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node,
val = xmlNodeGetContent(node);
xmlRelaxNGNormExtSpace(val);
if (xmlValidateNCName(val, 0)) {
if (ctxt->error != NULL) {
if (node->parent != NULL)
ctxt->error(ctxt->userData,
"Element %s name '%s' is not an NCName\n",
node->parent->name, val);
else
ctxt->error(ctxt->userData,
"name '%s' is not an NCName\n", val);
}
ctxt->nbErrors++;
if (node->parent != NULL)
xmlRngPErr(ctxt, node, XML_RNGP_ELEMENT_NAME,
"Element %s name '%s' is not an NCName\n",
node->parent->name, val);
else
xmlRngPErr(ctxt, node, XML_RNGP_ELEMENT_NAME,
"name '%s' is not an NCName\n",
val, NULL);
}
ret->name = val;
val = xmlGetProp(node, BAD_CAST "ns");
@ -5201,18 +5129,16 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node,
if ((ctxt->flags & XML_RELAXNG_IN_ATTRIBUTE) &&
(val != NULL) &&
(xmlStrEqual(val, BAD_CAST "http://www.w3.org/2000/xmlns"))) {
ctxt->error(ctxt->userData,
xmlRngPErr(ctxt, node, XML_RNGP_XML_NS,
"Attribute with namespace '%s' is not allowed\n",
val);
ctxt->nbErrors++;
val, NULL);
}
if ((ctxt->flags & XML_RELAXNG_IN_ATTRIBUTE) &&
(val != NULL) &&
(val[0] == 0) && (xmlStrEqual(ret->name, BAD_CAST "xmlns"))) {
ctxt->error(ctxt->userData,
"Attribute with QName 'xmlns' is not allowed\n",
val);
ctxt->nbErrors++;
xmlRngPErr(ctxt, node, XML_RNGP_XMLNS_NAME,
"Attribute with QName 'xmlns' is not allowed\n",
val, NULL);
}
} else if (IS_RELAXNG(node, "anyName")) {
ret->name = NULL;