From 54a8f67c0504bb1bc17a2e5f139f3128953915d1 Mon Sep 17 00:00:00 2001
From: Rob Richards <rrichard@src.gnome.org>
Date: Fri, 7 Oct 2005 02:33:00 +0000
Subject: [PATCH] remove warnings under Windows.

* schematron.c xmlregexp.c: remove warnings under Windows.
---
 ChangeLog    |  4 ++++
 schematron.c |  6 +++---
 xmlregexp.c  | 14 +++++++-------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cfd44d71..2a3f6ef8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct  7 04:34:12 CEST 2005 Rob Richards <rrichards@ctindustries.net>
+
+	* schematron.c xmlregexp.c: remove warnings under Windows.
+
 Wed Sep 28 23:42:14 CEST 2005 Daniel Veillard <daniel@veillard.com>
 
 	* parser.c: applied patch from Massimo Morara fixing bug #317447
diff --git a/schematron.c b/schematron.c
index 9cb50271..98184acc 100644
--- a/schematron.c
+++ b/schematron.c
@@ -562,7 +562,7 @@ xmlSchematronFree(xmlSchematronPtr schema)
         xmlFreeDoc(schema->doc);
 
     if (schema->namespaces != NULL)
-        xmlFree(schema->namespaces);
+        xmlFree((char **) schema->namespaces);
     
     xmlSchematronFreeRules(schema->rules);
     xmlSchematronFreePatterns(schema->patterns);
@@ -709,7 +709,7 @@ xmlSchematronFreeParserCtxt(xmlSchematronParserCtxtPtr ctxt)
         xmlXPathFreeContext(ctxt->xctxt);
     }
     if (ctxt->namespaces != NULL)
-        xmlFree(ctxt->namespaces);
+        xmlFree((char **) ctxt->namespaces);
     xmlDictFree(ctxt->dict);
     xmlFree(ctxt);
 }
@@ -809,7 +809,7 @@ xmlSchematronAddNamespace(xmlSchematronParserCtxtPtr ctxt,
         const xmlChar **tmp;
 
 	tmp = (const xmlChar **)
-	    xmlRealloc(ctxt->namespaces, ctxt->maxNamespaces * 4 *
+	    xmlRealloc((xmlChar **) ctxt->namespaces, ctxt->maxNamespaces * 4 *
 	               sizeof(const xmlChar *));
 	if (tmp == NULL) {
 	    xmlSchematronPErrMemory(NULL, "allocating parser namespaces",
diff --git a/xmlregexp.c b/xmlregexp.c
index befd9136..00f99f1c 100644
--- a/xmlregexp.c
+++ b/xmlregexp.c
@@ -6878,10 +6878,10 @@ xmlExpExpDeriveInt(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, xmlExpNodePtr sub) {
     len = xmlExpGetStartInt(ctxt, sub, tab, ctxt->tabSize, 0);
     while (len < 0) {
         const xmlChar **temp;
-	temp = (const xmlChar **) xmlRealloc(tab, ctxt->tabSize * 2 *
+	temp = (const xmlChar **) xmlRealloc((xmlChar **) tab, ctxt->tabSize * 2 *
 	                                     sizeof(const xmlChar *));
 	if (temp == NULL) {
-	    xmlFree(tab);
+	    xmlFree((xmlChar **) tab);
 	    return(NULL);
 	}
 	tab = temp;
@@ -6892,14 +6892,14 @@ xmlExpExpDeriveInt(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, xmlExpNodePtr sub) {
         tmp = xmlExpStringDeriveInt(ctxt, exp, tab[i]);
 	if ((tmp == NULL) || (tmp == forbiddenExp)) {
 	    xmlExpFree(ctxt, ret);
-	    xmlFree(tab);
+	    xmlFree((xmlChar **) tab);
 	    return(tmp);
 	}
 	tmp2 = xmlExpStringDeriveInt(ctxt, sub, tab[i]);
 	if ((tmp2 == NULL) || (tmp2 == forbiddenExp)) {
 	    xmlExpFree(ctxt, tmp);
 	    xmlExpFree(ctxt, ret);
-	    xmlFree(tab);
+	    xmlFree((xmlChar **) tab);
 	    return(tmp);
 	}
 	tmp3 = xmlExpExpDeriveInt(ctxt, tmp, tmp2);
@@ -6908,7 +6908,7 @@ xmlExpExpDeriveInt(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, xmlExpNodePtr sub) {
 
 	if ((tmp3 == NULL) || (tmp3 == forbiddenExp)) {
 	    xmlExpFree(ctxt, ret);
-	    xmlFree(tab);
+	    xmlFree((xmlChar **) tab);
 	    return(tmp3);
 	}
 
@@ -6917,12 +6917,12 @@ xmlExpExpDeriveInt(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, xmlExpNodePtr sub) {
 	else {
 	    ret = xmlExpHashGetEntry(ctxt, XML_EXP_OR, ret, tmp3, NULL, 0, 0);
 	    if (ret == NULL) {
-		xmlFree(tab);
+		xmlFree((xmlChar **) tab);
 	        return(NULL);
 	    }
 	}
     }
-    xmlFree(tab);
+    xmlFree((xmlChar **) tab);
     return(ret);
 }