[xml] 2.2.6 patches

From: Albert Chin-A-Young (china@thewrittenword.com)
Date: Fri Oct 27 2000 - 09:47:44 EDT

• Previous message: Daniel Veillard: "Re: [xml] Big clean up in XPath"

1. xmlversion.h.in should not be installed.
2. Some type clashes in xpath.c. There are more. You really
   should not intermix int and enum types. They should be
   treated as two different types. The IRIX C compiler warns
   about the following:

cc -DHAVE_CONFIG_H -I. -I. -I. -I./include -I./include
-I/opt/TWWfsw/zlib11/include -I/opt/TWWfsw/readline4/include
-I/opt/TWWfsw/readline4/include -Wl,-woff,84 -Wl,-woff,85 -woff 1429
-O2 -c xpath.c -DPIC -o .libs/xpath.lo
cc-1552 cc: WARNING File = xpath.c, Line = 4167
  The variable "blank" is set but never used.

            int blank = 0;
                ^

cc-1185 cc: WARNING File = xpath.c, Line = 4723
  An enumerated type is mixed with another type.

      *type = 0;
            ^

cc-1185 cc: WARNING File = xpath.c, Line = 4724
  An enumerated type is mixed with another type.

      *test = 0;
            ^

cc-1185 cc: WARNING File = xpath.c, Line = 4832
  An enumerated type is mixed with another type.

      xmlXPathAxisVal ret = 0;
                            ^

cc-1185 cc: WARNING File = xpath.c, Line = 4897
  An enumerated type is mixed with another type.

            XP_ERROR0(XPATH_EXPR_ERROR);
            ^

cc-1185 cc: WARNING File = xpath.c, Line = 4905
  An enumerated type is mixed with another type.

            XP_ERROR0(XPATH_EXPR_ERROR);
            ^

-- 
albert chin (china@thewrittenword.com)
-- snip snip
--- include/Makefile.am.orig	Fri Oct 27 08:19:40 2000
+++ include/Makefile.am	Fri Oct 27 08:19:52 2000
@@ -3,7 +3,6 @@
 xmlincdir = $(includedir)
 
 xmlinc_HEADERS = \
-		libxml/xmlversion.h.in \
 		libxml/SAX.h \
 		libxml/entities.h \
 		libxml/encoding.h \
--- xpath.c.orig	Fri Oct 27 07:55:17 2000
+++ xpath.c	Fri Oct 27 08:05:48 2000
@@ -4232,7 +4232,7 @@
 	    SKIP(2);
 	    SKIP_BLANKS;
 	    xmlXPathNodeCollectAndTest(ctxt, AXIS_DESCENDANT_OR_SELF,
-			     NODE_TEST_TYPE, XML_ELEMENT_NODE, NULL, NULL);
+			     NODE_TEST_TYPE, NODE_TYPE_NODE, NULL, NULL);
 	    ctxt->context->node = NULL;
 	    xmlXPathEvalRelativeLocationPath(ctxt);
 	} else if (CUR == '/') {
@@ -4948,7 +4948,7 @@
 	SKIP(2);
 	SKIP_BLANKS;
 	xmlXPathNodeCollectAndTest(ctxt, AXIS_PARENT,
-			 NODE_TEST_TYPE, XML_ELEMENT_NODE, NULL, NULL);
+			 NODE_TEST_TYPE, NODE_TYPE_NODE, NULL, NULL);
     } else if (CUR == '.') {
 	NEXT;
 	SKIP_BLANKS;
@@ -5058,7 +5058,7 @@
 	SKIP(2);
 	SKIP_BLANKS;
 	xmlXPathNodeCollectAndTest(ctxt, AXIS_DESCENDANT_OR_SELF,
-			 NODE_TEST_TYPE, XML_ELEMENT_NODE, NULL, NULL);
+			 NODE_TEST_TYPE, NODE_TYPE_NODE, NULL, NULL);
     } else if (CUR == '/') {
 	    NEXT;
 	SKIP_BLANKS;
@@ -5070,7 +5070,7 @@
 	    SKIP(2);
 	    SKIP_BLANKS;
 	    xmlXPathNodeCollectAndTest(ctxt, AXIS_DESCENDANT_OR_SELF,
-			     NODE_TEST_TYPE, XML_ELEMENT_NODE, NULL, NULL);
+			     NODE_TEST_TYPE, NODE_TYPE_NODE, NULL, NULL);
 	    xmlXPathEvalStep(ctxt);
 	} else if (CUR == '/') {
 	    NEXT;
@@ -5112,7 +5112,7 @@
 		SKIP_BLANKS;
 		xmlXPathNodeCollectAndTest(ctxt,
 		                 AXIS_DESCENDANT_OR_SELF, NODE_TEST_TYPE,
-				 XML_ELEMENT_NODE, NULL, NULL);
+				 NODE_TYPE_NODE, NULL, NULL);
 		xmlXPathEvalRelativeLocationPath(ctxt);
 	    } else if (CUR == '/') {
 		NEXT;
----
Message from the list xml@rpmfind.net
Archived at : http://xmlsoft.org/messages/
to unsubscribe: echo "unsubscribe xml" | mail  majordomo@rpmfind.net

• Previous message: Daniel Veillard: "Re: [xml] Big clean up in XPath"

This archive was generated by hypermail 2b29 : Fri Oct 27 2000 - 10:43:30 EDT