# HG changeset patch
# User William M. Brack <wbrack@src.gnome.org>
# Date 1077554430 0
#      Mon Feb 23 16:40:30 2004 +0000
# Node ID 69a858354524b410644ff9451a6059804e787b92
# Parent  6282cc30f6c7750371c1edf9a3a29a1a290bbaab
minor changes to eliminate compilation warnings. No change to logic.

* libxslt/xsltutils.c, libxslt/templates.c, libxslt/preproc.c:
  minor changes to eliminate compilation warnings.  No change
  to logic.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb 24 00:37:28 HKT 2004 William Brack <wbrack@mmm.com.hk>
+
+	* libxslt/xsltutils.c, libxslt/templates.c, libxslt/preproc.c:
+	  minor changes to eliminate compilation warnings.  No change
+	  to logic.
+
 Sun Feb 22 23:59:12 CET 2004 Daniel Veillard <daniel@veillard.com>
 
 	* libexslt/exsltexports.h libxslt/xsltexports.h: patches from
diff --git a/libxslt/preproc.c b/libxslt/preproc.c
--- a/libxslt/preproc.c
+++ b/libxslt/preproc.c
@@ -632,7 +632,7 @@
     } else {
         const xmlChar *URI;
 
-	URI = xsltGetQNameURI(inst, &prop);
+	URI = xsltGetQNameURI(inst, (xmlChar **)&prop);
 	if (prop == NULL) {
 	    if (style != NULL) style->errors++;
 	} else {
@@ -716,14 +716,14 @@
 	    xsltTransformError(NULL, style, cur,
 			 "xsl:number : invalid value %s for level\n", prop);
 	    if (style != NULL) style->warnings++;
-	    xmlFree(prop);
+	    xmlFree((void *)(prop));
 	}
     }
     
     prop = xsltGetCNsProp(style, cur, (const xmlChar *)"lang", XSLT_NAMESPACE);
     if (prop != NULL) {
 	XSLT_TODO; /* xsl:number lang attribute */
-	xmlFree(prop);
+	xmlFree((void *)prop);
     }
     
     prop = xsltGetCNsProp(style, cur, (const xmlChar *)"letter-value", XSLT_NAMESPACE);
@@ -821,7 +821,7 @@
     } else {
         const xmlChar *URI;
 
-	URI = xsltGetQNameURI(inst, &prop);
+	URI = xsltGetQNameURI(inst, (xmlChar **)&prop);
 	if (prop == NULL) {
 	    if (style != NULL) style->errors++;
 	} else {
@@ -865,7 +865,7 @@
     if (prop != NULL) {
         const xmlChar *URI;
 
-	URI = xsltGetQNameURI(inst, &prop);
+	URI = xsltGetQNameURI(inst, (xmlChar **)&prop);
 	if (prop == NULL) {
 	    if (style != NULL) style->errors++;
 	} else {
@@ -1050,7 +1050,7 @@
     } else {
         const xmlChar *URI;
 
-	URI = xsltGetQNameURI(inst, &prop);
+	URI = xsltGetQNameURI(inst, (xmlChar **)&prop);
 	if (prop == NULL) {
 	    if (style != NULL) style->errors++;
 	} else {
@@ -1114,7 +1114,7 @@
     } else {
         const xmlChar *URI;
 
-	URI = xsltGetQNameURI(inst, &prop);
+	URI = xsltGetQNameURI(inst, (xmlChar **)&prop);
 	if (prop == NULL) {
 	    if (style != NULL) style->errors++;
 	} else {
diff --git a/libxslt/templates.c b/libxslt/templates.c
--- a/libxslt/templates.c
+++ b/libxslt/templates.c
@@ -496,7 +496,7 @@
 		xmlChar *val;
 		val = xsltEvalAVT(ctxt, cur->_private, cur->parent);
 		if (val == NULL) {
-		    text->content = xmlStrdup("runtime error");
+		    text->content = xmlStrdup(BAD_CAST "runtime error");
 		} else {
 		    text->content = val;
 		}
diff --git a/libxslt/xsltutils.c b/libxslt/xsltutils.c
--- a/libxslt/xsltutils.c
+++ b/libxslt/xsltutils.c
@@ -13,6 +13,7 @@
 #include "libxslt.h"
 
 #include <stdio.h>
+#include <string.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
@@ -1071,12 +1072,12 @@
 	comp = sorts[j]->_private;
 	if (tempstype[j] == 1) {
 	    /* The data-type needs to be recomputed each time */
-	    xmlFree(comp->stype);
+	    xmlFree((void *)(comp->stype));
 	    comp->stype = NULL;
 	}
 	if (temporder[j] == 1) {
 	    /* The order needs to be recomputed each time */
-	    xmlFree(comp->order);
+	    xmlFree((void *)(comp->order));
 	    comp->order = NULL;
 	}
 	if (resultsTab[j] != NULL) {