summaryrefslogtreecommitdiff
path: root/pattern.c
diff options
context:
space:
mode:
authorKasimier T. Buchcik <kbuchcik@src.gnome.org>2005-10-17 12:39:58 +0000
committerKasimier T. Buchcik <kbuchcik@src.gnome.org>2005-10-17 12:39:58 +0000
commit65c2f1d78acaea8cde6578eaef0c0051f31369f9 (patch)
treeae7b70a9cd6330dd2f0cae0509bd7be79867f826 /pattern.c
parent95c3adf57a6192d4938ef47fd9b166ad439cc11c (diff)
downloadlibxml2-65c2f1d78acaea8cde6578eaef0c0051f31369f9.tar.gz
Silenced intel compiler warnings (reported by Kjartan Maraas, bug
* tree.c pattern.c: Silenced intel compiler warnings (reported by Kjartan Maraas, bug #318517). * xmlschemas.c: The above changes in pattern.c revealed an inconsistency wrt IDCs: we now _only_ pop XPath states, if we really pushed them beforehand; this was previously not checked for the case when we discover an element node to be invalid wrt the content model. Fixed segfault in xmlSchemaGetEffectiveValueConstraint().
Diffstat (limited to 'pattern.c')
-rw-r--r--pattern.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/pattern.c b/pattern.c
index f65c6153..9f3b0254 100644
--- a/pattern.c
+++ b/pattern.c
@@ -1931,11 +1931,9 @@ xmlStreamPushAttr(xmlStreamCtxtPtr stream,
int
xmlStreamPop(xmlStreamCtxtPtr stream) {
int i, lev;
- int ret;
-
+
if (stream == NULL)
return(-1);
- ret = 0;
while (stream != NULL) {
/*
* Reset block-level.
@@ -1945,7 +1943,7 @@ xmlStreamPop(xmlStreamCtxtPtr stream) {
stream->level--;
if (stream->level < 0)
- ret = -1;
+ return(-1);
/*
* Check evolution of existing states
*/