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/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
}