minor change to avoid compilation warnings on some (e.g. AIX) systems
* HTMLparser.c, entities.c, xmlreader.c: minor change to
avoid compilation warnings on some (e.g. AIX) systems
diff --git a/ChangeLog b/ChangeLog
index 9bd0ac5..4fa14d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 26 11:03:08 PDT 2003 William Brack <wbrack@mmm.com.hk>
+
+ * HTMLparser.c, entities.c, xmlreader.c: minor change to
+ avoid compilation warnings on some (e.g. AIX) systems
+
Fri Sep 26 16:49:25 CEST 2003 Daniel Veillard <daniel@veillard.com>
* parserInternals.c: fixed a backward compatibility problem
diff --git a/HTMLparser.c b/HTMLparser.c
index caed896..1606547 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -1037,10 +1037,11 @@
htmlAutoCloseOnClose(htmlParserCtxtPtr ctxt, const xmlChar * newtag)
{
const htmlElemDesc *info;
- const xmlChar *oldname;
int i, priority;
#ifdef DEBUG
+ const xmlChar *oldname;
+
xmlGenericError(xmlGenericErrorContext,
"Close of %s stack: %d elements\n", newtag,
ctxt->nameNr);
@@ -1090,12 +1091,14 @@
}
if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
ctxt->sax->endElement(ctxt->userData, ctxt->name);
- oldname = htmlnamePop(ctxt);
#ifdef DEBUG
+ oldname = htmlnamePop(ctxt);
if (oldname != NULL) {
xmlGenericError(xmlGenericErrorContext,
"htmlAutoCloseOnClose: popped %s\n", oldname);
}
+#else
+ htmlnamePop(ctxt);
#endif
}
}
@@ -1109,16 +1112,16 @@
static void
htmlAutoCloseOnEnd(htmlParserCtxtPtr ctxt)
{
- const xmlChar *oldname;
int i;
-
- if (ctxt->nameNr == 0)
- return;
#ifdef DEBUG
+ const xmlChar *oldname;
+
xmlGenericError(xmlGenericErrorContext,
"Close of stack: %d elements\n", ctxt->nameNr);
#endif
+ if (ctxt->nameNr == 0)
+ return;
for (i = (ctxt->nameNr - 1); i >= 0; i--) {
#ifdef DEBUG
xmlGenericError(xmlGenericErrorContext, "%d : %s\n", i,
@@ -1126,12 +1129,14 @@
#endif
if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
ctxt->sax->endElement(ctxt->userData, ctxt->name);
- oldname = htmlnamePop(ctxt);
#ifdef DEBUG
+ oldname = htmlnamePop(ctxt);
if (oldname != NULL) {
xmlGenericError(xmlGenericErrorContext,
"htmlAutoCloseOnEnd: popped %s\n", oldname);
}
+#else
+ htmlnamePop(ctxt);
#endif
}
}
@@ -1151,7 +1156,9 @@
static void
htmlAutoClose(htmlParserCtxtPtr ctxt, const xmlChar * newtag)
{
+#ifdef DEBUG
const xmlChar *oldname;
+#endif
while ((newtag != NULL) && (ctxt->name != NULL) &&
(htmlCheckAutoClose(newtag, ctxt->name))) {
@@ -1162,12 +1169,14 @@
#endif
if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
ctxt->sax->endElement(ctxt->userData, ctxt->name);
- oldname = htmlnamePop(ctxt);
#ifdef DEBUG
+ oldname = htmlnamePop(ctxt);
if (oldname != NULL) {
xmlGenericError(xmlGenericErrorContext,
"htmlAutoClose: popped %s\n", oldname);
}
+#else
+ htmlnamePop(ctxt);
#endif
}
if (newtag == NULL) {
@@ -1184,12 +1193,14 @@
#endif
if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
ctxt->sax->endElement(ctxt->userData, ctxt->name);
- oldname = htmlnamePop(ctxt);
#ifdef DEBUG
+ oldname = htmlnamePop(ctxt);
if (oldname != NULL) {
xmlGenericError(xmlGenericErrorContext,
"htmlAutoClose: popped %s\n", oldname);
}
+#else
+ htmlnamePop(ctxt);
#endif
}
diff --git a/entities.c b/entities.c
index 67317f3..f7693bb 100644
--- a/entities.c
+++ b/entities.c
@@ -771,11 +771,13 @@
xmlChar *buffer = NULL;
xmlChar *out = NULL;
int buffer_size = 0;
+#if 0
int html = 0;
- if (input == NULL) return(NULL);
if (doc != NULL)
html = (doc->type == XML_HTML_DOCUMENT_NODE);
+#endif
+ if (input == NULL) return(NULL);
/*
* allocate an translation buffer.
diff --git a/xmlreader.c b/xmlreader.c
index c7a576b..4d42440 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -797,7 +797,7 @@
int
xmlTextReaderRead(xmlTextReaderPtr reader) {
int val, olddepth = 0;
- xmlTextReaderState oldstate = 0;
+ xmlTextReaderState oldstate = XML_TEXTREADER_START;
xmlNodePtr oldnode = NULL;
if ((reader == NULL) || (reader->ctxt == NULL))
@@ -1206,7 +1206,6 @@
xmlTextReaderPtr
xmlNewTextReader(xmlParserInputBufferPtr input, const char *URI) {
xmlTextReaderPtr ret;
- int val;
if (input == NULL)
return(NULL);
@@ -1252,7 +1251,7 @@
ret->node = NULL;
ret->curnode = NULL;
if (ret->input->buffer->use < 4) {
- val = xmlParserInputBufferRead(input, 4);
+ xmlParserInputBufferRead(input, 4);
}
if (ret->input->buffer->use >= 4) {
ret->ctxt = xmlCreatePushParserCtxt(ret->sax, NULL,
@@ -3056,7 +3055,7 @@
}
static void
-xmlTextReaderGenericError(void *ctxt, int severity, char *str) {
+xmlTextReaderGenericError(void *ctxt, xmlParserSeverities severity, char *str) {
xmlParserCtxtPtr ctx = (xmlParserCtxtPtr)ctxt;
xmlTextReaderPtr reader = (xmlTextReaderPtr)ctx->_private;