commit c3ca5ba4057ef61012d687c5a48af5ed93e41494
author Daniel Veillard <veillard@src.gnome.org> Fri May 09 22:26:28 2003 +0000
committer Daniel Veillard <veillard@src.gnome.org> Fri May 09 22:26:28 2003 +0000
tree 450bfc854ab3092b6e7ac309c94a4c0e09770afc
parent 37fc84d1555b06cd0600d21115851ec397d34ba2

removed multiple warning, this fixed a bug and should close #111574 Daniel

* DOCBparser.c catalog.c parser.c relaxng.c: removed multiple
  warning, this fixed a bug and should close #111574
Daniel

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 0e8928b..ce0058e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May  9 18:14:16 EDT 2003 Daniel Veillard <daniel@veillard.com>
+
+	* DOCBparser.c catalog.c parser.c relaxng.c: removed multiple
+	  warning, this fixed a bug and should close #111574
+
 Fri May  9 15:34:32 EDT 2003 Daniel Veillard <daniel@veillard.com>
 
 	* xmlschemas.c: fixing bug #104081 with xs:all with an element

DOCBparser.c

diff --git a/DOCBparser.c b/DOCBparser.c
index 82b9565..6e8a13d 100644
--- a/DOCBparser.c
+++ b/DOCBparser.c
@@ -5918,7 +5918,8 @@
     if (filename == NULL)
        inputStream->filename = NULL;
     else
-       inputStream->filename = xmlCanonicPath(filename);
+       inputStream->filename = (char *)
+            xmlCanonicPath((const xmlChar *)filename);
     inputStream->buf = buf;
     inputStream->base = inputStream->buf->buffer->content;
     inputStream->cur = inputStream->buf->buffer->content;

catalog.c

diff --git a/catalog.c b/catalog.c
index 1a0ebcb..29f98d2 100644
--- a/catalog.c
+++ b/catalog.c
@@ -788,7 +788,7 @@
 	return(NULL);
     }
 
-    inputStream->filename = xmlCanonicPath(filename);
+    inputStream->filename = (char *) xmlCanonicPath((const xmlChar *)filename);
     inputStream->buf = buf;
     inputStream->base = inputStream->buf->buffer->content;
     inputStream->cur = inputStream->buf->buffer->content;

parser.c

diff --git a/parser.c b/parser.c
index 922ab43..faeda8d 100644
--- a/parser.c
+++ b/parser.c
@@ -10751,7 +10751,7 @@
   
     xmlClearParserCtxt(ctxt);
     if (filename != NULL)
-        input->filename = xmlCanonicPath(filename);
+        input->filename = (char *) xmlCanonicPath((const xmlChar *)filename);
     input->base = buffer;
     input->cur = buffer;
     input->end = &buffer[xmlStrlen(buffer)];

relaxng.c

diff --git a/relaxng.c b/relaxng.c
index c56c7ea..55e0852 100644
--- a/relaxng.c
+++ b/relaxng.c
@@ -6552,7 +6552,7 @@
     if (ctxt->URL != NULL)
 	xmlFree(ctxt->URL);
     if (ctxt->doc != NULL)
-	xmlFreeDoc(ctxt->doc);
+	xmlRelaxNGFreeDocument(ctxt->doc);
     if (ctxt->interleaves != NULL)
         xmlHashFree(ctxt->interleaves, NULL);
     if (ctxt->documents != NULL)
@@ -7751,7 +7751,7 @@
     xmlRelaxNGDefinePtr define = (xmlRelaxNGDefinePtr) transdata;
     xmlRelaxNGValidStatePtr state, oldstate;
     xmlNodePtr node = ctxt->pnode;
-    int ret, oldflags;
+    int ret = 0, oldflags;
 
 #ifdef DEBUG_PROGRESSIVE
     xmlGenericError(xmlGenericErrorContext,