lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-30 22:43:14 +03:00
Code Activity

in case of content model validity error, don't print it if validity

Browse Source 
* valid.c: in case of content model validity error, don't
  print it if validity warnings were not requested.
Daniel
This commit is contained in:
Daniel Veillard
2001-11-20 09:37:09 +00:00
parent c69e0b1760
commit b4545fd68f
2 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Nov 20 10:34:01 CET 2001 Daniel Veillard <daniel@veillard.com>
* valid.c: in case of content model validity error, don't
print it if validity warnings were not requested.
Tue Nov 20 09:30:02 CET 2001 Daniel Veillard <daniel@veillard.com> Tue Nov 20 09:30:02 CET 2001 Daniel Veillard <daniel@veillard.com>
* nanoftp.c: applied a couple of patches from Brian D Ripley. * nanoftp.c: applied a couple of patches from Brian D Ripley.

45
valid.c
View File

@ -3404,7 +3404,7 @@ xmlValidateSkipIgnorable(xmlNodePtr child) {
static int static int
xmlValidateElementType(xmlValidCtxtPtr ctxt) { xmlValidateElementType(xmlValidCtxtPtr ctxt) {
int ret = -1, tmp; int ret = -1;
int determinist = 1; int determinist = 1;
NODE = xmlValidateSkipIgnorable(NODE); NODE = xmlValidateSkipIgnorable(NODE);
@ -3973,25 +3973,36 @@ xmlValidateElementContent(xmlValidCtxtPtr ctxt, xmlNodePtr child,
ret = xmlValidateElementType(ctxt); ret = xmlValidateElementType(ctxt);
} }
if ((warn) && ((ret != 1) && (ret != -3))) { if ((warn) && ((ret != 1) && (ret != -3))) {
char expr[5000]; if ((ctxt != NULL) && (ctxt->warning != NULL)) {
char list[5000]; char expr[5000];
char list[5000];
expr[0] = 0; expr[0] = 0;
xmlSnprintfElementContent(expr, 5000, cont, 1); xmlSnprintfElementContent(expr, 5000, cont, 1);
list[0] = 0; list[0] = 0;
if (repl != NULL) if (repl != NULL)
xmlSnprintfElements(list, 5000, repl, 1); xmlSnprintfElements(list, 5000, repl, 1);
else else
xmlSnprintfElements(list, 5000, child, 1); xmlSnprintfElements(list, 5000, child, 1);
if (name != NULL) { if (name != NULL) {
VERROR(ctxt->userData, VERROR(ctxt->userData,
"Element %s content doesn't follow the Dtd\nExpecting %s, got %s\n", "Element %s content doesn't follow the Dtd\nExpecting %s, got %s\n",
name, expr, list); name, expr, list);
} else {
VERROR(ctxt->userData,
"Element content doesn't follow the Dtd\nExpecting %s, got %s\n",
expr, list);
}
} else { } else {
VERROR(ctxt->userData, if (name != NULL) {
"Element content doesn't follow the Dtd\nExpecting %s, got %s\n", VERROR(ctxt->userData,
expr, list); "Element %s content doesn't follow the Dtd\n",
name);
} else {
VERROR(ctxt->userData,
"Element content doesn't follow the Dtd\n");
}
} }
ret = 0; ret = 0;
} }