lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00
Code Activity

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

Browse Source 
* DOCBparser.c catalog.c parser.c relaxng.c: removed multiple
  warning, this fixed a bug and should close #111574
Daniel
This commit is contained in:
Daniel Veillard
2003-05-09 22:26:28 +00:00
parent 37fc84d155
commit c3ca5ba405
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> Fri May 9 15:34:32 EDT 2003 Daniel Veillard <daniel@veillard.com>
* xmlschemas.c: fixing bug #104081 with xs:all with an element * xmlschemas.c: fixing bug #104081 with xs:all with an element

3
DOCBparser.c
View File

@ -5918,7 +5918,8 @@ docbCreatePushParserCtxt(docbSAXHandlerPtr sax, void *user_data,
if (filename == NULL) if (filename == NULL)
inputStream->filename = NULL; inputStream->filename = NULL;
else else
inputStream->filename = xmlCanonicPath(filename); inputStream->filename = (char *)
xmlCanonicPath((const xmlChar *)filename);
inputStream->buf = buf; inputStream->buf = buf;
inputStream->base = inputStream->buf->buffer->content; inputStream->base = inputStream->buf->buffer->content;
inputStream->cur = inputStream->buf->buffer->content; inputStream->cur = inputStream->buf->buffer->content;

2
catalog.c
View File

@ -788,7 +788,7 @@ xmlParseCatalogFile(const char *filename) {
return(NULL); return(NULL);
} }
inputStream->filename = xmlCanonicPath(filename); inputStream->filename = (char *) xmlCanonicPath((const xmlChar *)filename);
inputStream->buf = buf; inputStream->buf = buf;
inputStream->base = inputStream->buf->buffer->content; inputStream->base = inputStream->buf->buffer->content;
inputStream->cur = inputStream->buf->buffer->content; inputStream->cur = inputStream->buf->buffer->content;

2
parser.c
View File

@ -10751,7 +10751,7 @@ xmlSetupParserForBuffer(xmlParserCtxtPtr ctxt, const xmlChar* buffer,
xmlClearParserCtxt(ctxt); xmlClearParserCtxt(ctxt);
if (filename != NULL) if (filename != NULL)
input->filename = xmlCanonicPath(filename); input->filename = (char *) xmlCanonicPath((const xmlChar *)filename);
input->base = buffer; input->base = buffer;
input->cur = buffer; input->cur = buffer;
input->end = &buffer[xmlStrlen(buffer)]; input->end = &buffer[xmlStrlen(buffer)];

4
relaxng.c
View File

@ -6552,7 +6552,7 @@ xmlRelaxNGFreeParserCtxt(xmlRelaxNGParserCtxtPtr ctxt) {
if (ctxt->URL != NULL) if (ctxt->URL != NULL)
xmlFree(ctxt->URL); xmlFree(ctxt->URL);
if (ctxt->doc != NULL) if (ctxt->doc != NULL)
xmlFreeDoc(ctxt->doc); xmlRelaxNGFreeDocument(ctxt->doc);
if (ctxt->interleaves != NULL) if (ctxt->interleaves != NULL)
xmlHashFree(ctxt->interleaves, NULL); xmlHashFree(ctxt->interleaves, NULL);
if (ctxt->documents != NULL) if (ctxt->documents != NULL)
@ -7751,7 +7751,7 @@ xmlRelaxNGValidateProgressiveCallback(xmlRegExecCtxtPtr exec ATTRIBUTE_UNUSED,
xmlRelaxNGDefinePtr define = (xmlRelaxNGDefinePtr) transdata; xmlRelaxNGDefinePtr define = (xmlRelaxNGDefinePtr) transdata;
xmlRelaxNGValidStatePtr state, oldstate; xmlRelaxNGValidStatePtr state, oldstate;
xmlNodePtr node = ctxt->pnode; xmlNodePtr node = ctxt->pnode;
int ret, oldflags; int ret = 0, oldflags;
#ifdef DEBUG_PROGRESSIVE #ifdef DEBUG_PROGRESSIVE
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,