diff --git a/ChangeLog b/ChangeLog index 0e8928bc..ce0058e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri May 9 18:14:16 EDT 2003 Daniel Veillard + + * 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 * xmlschemas.c: fixing bug #104081 with xs:all with an element diff --git a/DOCBparser.c b/DOCBparser.c index 82b95652..6e8a13da 100644 --- a/DOCBparser.c +++ b/DOCBparser.c @@ -5918,7 +5918,8 @@ docbCreatePushParserCtxt(docbSAXHandlerPtr sax, void *user_data, 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; diff --git a/catalog.c b/catalog.c index 1a0ebcb5..29f98d29 100644 --- a/catalog.c +++ b/catalog.c @@ -788,7 +788,7 @@ xmlParseCatalogFile(const char *filename) { 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; diff --git a/parser.c b/parser.c index 922ab433..faeda8d6 100644 --- a/parser.c +++ b/parser.c @@ -10751,7 +10751,7 @@ xmlSetupParserForBuffer(xmlParserCtxtPtr ctxt, const xmlChar* buffer, 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)]; diff --git a/relaxng.c b/relaxng.c index c56c7ea5..55e08520 100644 --- a/relaxng.c +++ b/relaxng.c @@ -6552,7 +6552,7 @@ xmlRelaxNGFreeParserCtxt(xmlRelaxNGParserCtxtPtr ctxt) { 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 @@ xmlRelaxNGValidateProgressiveCallback(xmlRegExecCtxtPtr exec ATTRIBUTE_UNUSED, xmlRelaxNGDefinePtr define = (xmlRelaxNGDefinePtr) transdata; xmlRelaxNGValidStatePtr state, oldstate; xmlNodePtr node = ctxt->pnode; - int ret, oldflags; + int ret = 0, oldflags; #ifdef DEBUG_PROGRESSIVE xmlGenericError(xmlGenericErrorContext,