fixed problem in previous fix to xmlXPathNodeSetSort
* xpath.c: fixed problem in previous fix to xmlXPathNodeSetSort
svn path=/trunk/; revision=3640
diff --git a/ChangeLog b/ChangeLog
index 5f5d9a7..5d6f9a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun 13 13:33:38 PDT 2007 William Brack <wbrack@mmm.com.hk>
+
+ * xpath.c: fixed problem in previous fix to xmlXPathNodeSetSort
+
Tue Jun 12 18:17:28 CEST 2007 Daniel Veillard <daniel@veillard.com>
* doc/* configure.in NEWS: release of libxml2 2.6.28
diff --git a/xpath.c b/xpath.c
index 8f6545a..9c4db87 100644
--- a/xpath.c
+++ b/xpath.c
@@ -3057,7 +3057,8 @@
precedence1 = 2; /* element is parent */
node1 = node1->parent;
}
- if ((node1 == NULL) || (node1->type != XML_ELEMENT_NODE)) {
+ if ((node1 == NULL) || (node1->type != XML_ELEMENT_NODE) ||
+ (0 <= (long) node1->content)) {
/*
* Fallback for whatever case.
*/
@@ -3194,11 +3195,6 @@
turtle_comparison:
- if (miscNode1 != NULL)
- node1 = miscNode1;
- if (miscNode2 != NULL)
- node2 = miscNode2;
-
if (node1 == node2->prev)
return(1);
if (node1 == node2->next)