shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-01-12 09:17:37 +03:00
Code

relaxng: Use error handler for internal errors

Browse Source 
Don't print to stderr.
This commit is contained in:
Nick Wellnhofer 2024-07-15 14:46:00 +02:00
parent 728869809e
commit 4b1832c115
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
relaxng.c
View File

@ -3169,9 +3169,9 @@ xmlRelaxNGCompile(xmlRelaxNGParserCtxtPtr ctxt, xmlRelaxNGDefinePtr def)
case XML_RELAXNG_LIST:
case XML_RELAXNG_PARAM:
case XML_RELAXNG_VALUE:
/* This should not happen and generate an internal error */
fprintf(stderr, "RNG internal error trying to compile %s\n",
xmlRelaxNGDefName(def));
xmlRngPErr(ctxt, NULL, XML_ERR_INTERNAL_ERROR,
"RNG internal error trying to compile %s\n",
BAD_CAST xmlRelaxNGDefName(def), NULL);
break;
}
return (ret);
@ -7859,19 +7859,22 @@ xmlRelaxNGValidateCompiledCallback(xmlRegExecCtxtPtr exec ATTRIBUTE_UNUSED,
int ret;
if (ctxt == NULL) {
fprintf(stderr, "callback on %s missing context\n", token);
xmlRngVErr(ctxt, NULL, XML_ERR_INTERNAL_ERROR,
"callback on %s missing context\n", token, NULL);
return;
}
if (define == NULL) {
if (token[0] == '#')
return;
fprintf(stderr, "callback on %s missing define\n", token);
xmlRngVErr(ctxt, NULL, XML_ERR_INTERNAL_ERROR,
"callback on %s missing define\n", token, NULL);
if ((ctxt != NULL) && (ctxt->errNo == XML_RELAXNG_OK))
ctxt->errNo = XML_RELAXNG_ERR_INTERNAL;
return;
}
if (define->type != XML_RELAXNG_ELEMENT) {
fprintf(stderr, "callback on %s define is not element\n", token);
xmlRngVErr(ctxt, NULL, XML_ERR_INTERNAL_ERROR,
"callback on %s define is not element\n", token, NULL);
if (ctxt->errNo == XML_RELAXNG_OK)
ctxt->errNo = XML_RELAXNG_ERR_INTERNAL;
return;
@ -8065,7 +8068,8 @@ xmlRelaxNGValidateProgressiveCallback(xmlRegExecCtxtPtr exec
int ret = 0, oldflags;
if (ctxt == NULL) {
fprintf(stderr, "callback on %s missing context\n", token);
xmlRngVErr(ctxt, NULL, XML_ERR_INTERNAL_ERROR,
"callback on %s missing context\n", token, NULL);
return;
}
node = ctxt->pnode;
@ -8073,14 +8077,16 @@ xmlRelaxNGValidateProgressiveCallback(xmlRegExecCtxtPtr exec
if (define == NULL) {
if (token[0] == '#')
return;
fprintf(stderr, "callback on %s missing define\n", token);
xmlRngVErr(ctxt, NULL, XML_ERR_INTERNAL_ERROR,
"callback on %s missing define\n", token, NULL);
if ((ctxt != NULL) && (ctxt->errNo == XML_RELAXNG_OK))
ctxt->errNo = XML_RELAXNG_ERR_INTERNAL;
ctxt->pstate = -1;
return;
}
if (define->type != XML_RELAXNG_ELEMENT) {
fprintf(stderr, "callback on %s define is not element\n", token);
xmlRngVErr(ctxt, NULL, XML_ERR_INTERNAL_ERROR,
"callback on %s define is not element\n", token, NULL);
if (ctxt->errNo == XML_RELAXNG_OK)
ctxt->errNo = XML_RELAXNG_ERR_INTERNAL;
ctxt->pstate = -1;