xmlStrstr args are both const small cleanup reformated, fixed problems if

* include/libxml/parser.h parser.c: xmlStrstr args are both const
* xpath.c: small cleanup
* xmlGetNsList: reformated, fixed problems if used on Entities
Daniel

ChangeLog

@@ -1,3 +1,9 @@
+Fri Jun 29 23:26:54 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* include/libxml/parser.h parser.c: xmlStrstr args are both const
+	* xpath.c: small cleanup
+	* xmlGetNsList: reformated, fixed problems if used on Entities
+
 Thu Jun 28 18:19:44 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* doc/xml.html: added 1.8.14 and 2.3.13 releases

Makefile.am

@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS=no-dependencies
+
+# Dependancies are fucked in make distcheck could not find why :-(
+# AUTOMAKE_OPTIONS=no-dependencies
 
 SUBDIRS = include . doc example
 

aclocal.m4

@@ -620,31 +620,35 @@ esac
 ])
 
 # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library, adds --enable-ltdl-convenience to
+# the libltdl convenience library and INCLTDL to the include flags for
-# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# the libltdl header and adds --enable-ltdl-convenience to the
-# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# '${top_builddir}/' (note the single quotes!) if your package is not
+# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# flat, and, if you're not using automake, define top_builddir as
+# with '${top_builddir}/' and INCLTDL will be prefixed with
-# appropriate in the Makefiles.
+# '${top_srcdir}/' (note the single quotes!).  If your package is not
+# flat and you're not using automake, define top_builddir and
+# top_srcdir appropriately in the Makefiles.
 AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   case "$enable_ltdl_convenience" in
   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
   "") enable_ltdl_convenience=yes
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
-  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
+  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
 ])
 
 # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library, and adds --enable-ltdl-install to
+# the libltdl installable library and INCLTDL to the include flags for
-# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# the libltdl header and adds --enable-ltdl-install to the configure
-# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# '${top_builddir}/' (note the single quotes!) if your package is not
+# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# flat, and, if you're not using automake, define top_builddir as
+# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# appropriate in the Makefiles.
+# with '${top_srcdir}/' (note the single quotes!).  If your package is
+# not flat and you're not using automake, define top_builddir and
+# top_srcdir appropriately in the Makefiles.
 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
 AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   AC_CHECK_LIB(ltdl, main,
@@ -657,8 +661,8 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   ])
   if test x"$enable_ltdl_install" = x"yes"; then
     ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
+    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
   else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"

include/libxml/parser.h

@@ -381,7 +381,7 @@ xmlChar *	xmlStrsub		(const xmlChar *str,
 const xmlChar *	xmlStrchr		(const xmlChar *str,
 					 xmlChar val);
 const xmlChar *	xmlStrstr		(const xmlChar *str,
-					 xmlChar *val);
+					 const xmlChar *val);
 const xmlChar *	xmlStrcasestr		(const xmlChar *str,
 					 xmlChar *val);
 int		xmlStrcmp		(const xmlChar *str1,

parser.c

@@ -1271,7 +1271,7 @@ xmlStrchr(const xmlChar *str, xmlChar val) {
  */
 
 const xmlChar *
-xmlStrstr(const xmlChar *str, xmlChar *val) {
+xmlStrstr(const xmlChar *str, const xmlChar *val) {
     int n;
     
     if (str == NULL) return(NULL);

tree.c

@@ -3823,7 +3823,8 @@ xmlTextMerge(xmlNodePtr first, xmlNodePtr second) {
  *         namespace if defined
  */
 xmlNsPtr *
-xmlGetNsList(xmlDocPtr doc ATTRIBUTE_UNUSED, xmlNodePtr node) {
+xmlGetNsList(xmlDocPtr doc ATTRIBUTE_UNUSED, xmlNodePtr node)
+{
     xmlNsPtr cur;
     xmlNsPtr *ret = NULL;
     int nbns = 0;
@@ -3831,41 +3832,48 @@ xmlGetNsList(xmlDocPtr doc ATTRIBUTE_UNUSED, xmlNodePtr node) {
     int i;
 
     while (node != NULL) {
-	cur = node->nsDef;
+        if (node->type == XML_ELEMENT_NODE) {
-	while (cur != NULL) {
+            cur = node->nsDef;
-	    if (ret == NULL) {
+            while (cur != NULL) {
-	        ret = (xmlNsPtr *) xmlMalloc((maxns + 1) * sizeof(xmlNsPtr));
+                if (ret == NULL) {
-		if (ret == NULL) {
+                    ret =
-		    xmlGenericError(xmlGenericErrorContext,
+                        (xmlNsPtr *) xmlMalloc((maxns + 1) *
-			    "xmlGetNsList : out of memory!\n");
+                                               sizeof(xmlNsPtr));
-		    return(NULL);
+                    if (ret == NULL) {
-		}
+                        xmlGenericError(xmlGenericErrorContext,
-		ret[nbns] = NULL;
+                                        "xmlGetNsList : out of memory!\n");
-	    }
+                        return (NULL);
-	    for (i = 0;i < nbns;i++) {
+                    }
-	        if ((cur->prefix == ret[i]->prefix) ||
+                    ret[nbns] = NULL;
-		    (xmlStrEqual(cur->prefix, ret[i]->prefix))) break;
+                }
-	    }
+                for (i = 0; i < nbns; i++) {
-	    if (i >= nbns) {
+                    if ((cur->prefix == ret[i]->prefix) ||
-	        if (nbns >= maxns) {
+                        (xmlStrEqual(cur->prefix, ret[i]->prefix)))
-		    maxns *= 2;
+                        break;
-		    ret = (xmlNsPtr *) xmlRealloc(ret,
+                }
-		                         (maxns + 1) * sizeof(xmlNsPtr));
+                if (i >= nbns) {
-		    if (ret == NULL) {
+                    if (nbns >= maxns) {
-			xmlGenericError(xmlGenericErrorContext,
+                        maxns *= 2;
-				"xmlGetNsList : realloc failed!\n");
+                        ret = (xmlNsPtr *) xmlRealloc(ret,
-			return(NULL);
+                                                      (maxns +
-		    }
+                                                       1) *
-		}
+                                                      sizeof(xmlNsPtr));
-		ret[nbns++] = cur;
+                        if (ret == NULL) {
-		ret[nbns] = NULL;
+                            xmlGenericError(xmlGenericErrorContext,
-	    }
+                                            "xmlGetNsList : realloc failed!\n");
+                            return (NULL);
+                        }
+                    }
+                    ret[nbns++] = cur;
+                    ret[nbns] = NULL;
+                }
 
-	    cur = cur->next;
+                cur = cur->next;
-	}
+            }
-	node = node->parent;
+        }
+        node = node->parent;
     }
-    return(ret);
+    return (ret);
 }
 
 /**

xpath.c

@@ -7449,6 +7449,7 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt,
 			    break;
 		    }
 	            break;
+		break;
 	    }
 	} while (cur != NULL);