From 537f1173c39eb21f9c5e8ad3cbc9bed2a08f25e4 Mon Sep 17 00:00:00 2001
From: "William M. Brack" <wbrack@src.gnome.org>
Date: Tue, 14 Jun 2005 22:02:59 +0000
Subject: [PATCH] adjusted last change to xmlCompilePathPattern, fixed one
 compilation

* pattern.c: adjusted last change to xmlCompilePathPattern,
  fixed one compilation warning
---
 ChangeLog | 5 +++++
 pattern.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a3f8eebf..6247585e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 14 15:03:22 PDT 2005 William Brack <wbrack@mmm.com.hk>
+
+	* pattern.c: adjusted last change to xmlCompilePathPattern,
+	  fixed one compilation warning
+
 Tue Jun 14 21:19:16 CEST 2005 Kasimier Buchcik <libxml2-cvs@cazic.net>
 
 	* pattern.c: Some changes/fixes to the streaming evaluation.
diff --git a/pattern.c b/pattern.c
index 292a2ca7..2438099c 100644
--- a/pattern.c
+++ b/pattern.c
@@ -1132,7 +1132,7 @@ error:
 static void
 xmlCompilePathPattern(xmlPatParserContextPtr ctxt) {
     SKIP_BLANKS;
-    if ((CUR == '/') && (NXT(1) != '/')) {
+    if (CUR == '/') {
         ctxt->comp->flags |= PAT_FROM_ROOT;
     } else if ((CUR == '.') || (ctxt->comp->flags & XML_PATTERN_NOTPATTERN)) {
         ctxt->comp->flags |= PAT_FROM_CUR;
@@ -1584,7 +1584,7 @@ static int
 xmlStreamPushInternal(xmlStreamCtxtPtr stream,
 		      const xmlChar *name, const xmlChar *ns,
 		      xmlElementType nodeType) {
-    int ret = 0, err = 0, tmp, i, m, match, step, desc, final;
+    int ret = 0, err = 0, final = 0, tmp, i, m, match, step, desc;
     xmlStreamCompPtr comp;
 #ifdef DEBUG_STREAMING
     xmlStreamCtxtPtr orig = stream;