further (final?) minor changes for compilation warnings. No change to
* encoding.c, parser.c, relaxng.c: further (final?) minor
changes for compilation warnings. No change to logic.
diff --git a/ChangeLog b/ChangeLog
index e6f113a..54fe841 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 27 12:19:38 PDT 2003 William Brack <wbrack@mmm.com.hk>
+
+ * encoding.c, parser.c, relaxng.c: further (final?) minor
+ changes for compilation warnings. No change to logic.
+
Fri Sep 26 18:03:42 PDT 2003 William Brack <wbrack@mmm.com.hk>
* parser.c: fixed small problem with missing entities (test/ent2)
diff --git a/encoding.c b/encoding.c
index 90fd38c..25f8cc3 100644
--- a/encoding.c
+++ b/encoding.c
@@ -2475,7 +2475,6 @@
UTF8ToISO8859x(unsigned char* out, int *outlen,
const unsigned char* in, int *inlen,
unsigned char const *xlattable) {
- const unsigned char* outend;
const unsigned char* outstart = out;
const unsigned char* inend;
const unsigned char* instart = in;
@@ -2489,7 +2488,6 @@
return(0);
}
inend = in + (*inlen);
- outend = out + (*outlen);
while (in < inend) {
unsigned char d = *in++;
if (d < 0x80) {
diff --git a/parser.c b/parser.c
index 32531e0..bd8d39a 100644
--- a/parser.c
+++ b/parser.c
@@ -675,8 +675,8 @@
*
* Pushes a new parser namespace on top of the ns stack
*
- * Returns -1 in case of error, the index in the stack otherwise,
- * and -2 if the namespace should be discarded.
+ * Returns -1 in case of error, -2 if the namespace should be discarded
+ * and the index in the stack otherwise.
*/
static int
nsPush(xmlParserCtxtPtr ctxt, const xmlChar *prefix, const xmlChar *URL)
@@ -4371,7 +4371,7 @@
ret = xmlParseAttValue(ctxt);
ctxt->instate = XML_PARSER_DTD;
if (ret == NULL) {
- xmlFatalErrMsg(ctxt, ctxt->errNo,
+ xmlFatalErrMsg(ctxt, (xmlParserErrors)ctxt->errNo,
"Attribute default value declaration error\n");
} else
*value = ret;
@@ -10773,7 +10773,7 @@
if (ctxt->errNo == 0)
ret = XML_ERR_INTERNAL_ERROR;
else
- ret = ctxt->errNo;
+ ret = (xmlParserErrors)ctxt->errNo;
} else {
if (list != NULL) {
xmlNodePtr cur;
@@ -10901,12 +10901,12 @@
if (lst != NULL)
*lst = NULL;
if (string == NULL)
- return(-1);
+ return(XML_ERR_INTERNAL_ERROR);
size = xmlStrlen(string);
ctxt = xmlCreateMemoryParserCtxt((char *) string, size);
- if (ctxt == NULL) return(-1);
+ if (ctxt == NULL) return(XML_WAR_UNDECLARED_ENTITY);
if (user_data != NULL)
ctxt->userData = user_data;
else
@@ -10925,7 +10925,7 @@
ctxt->sax = oldsax;
ctxt->dict = NULL;
xmlFreeParserCtxt(ctxt);
- return(-1);
+ return(XML_ERR_INTERNAL_ERROR);
}
ctxt->myDoc = newDoc;
} else {
@@ -10940,7 +10940,7 @@
xmlFreeParserCtxt(ctxt);
if (newDoc != NULL)
xmlFreeDoc(newDoc);
- return(-1);
+ return(XML_ERR_INTERNAL_ERROR);
}
nodePush(ctxt, ctxt->myDoc->children);
ctxt->instate = XML_PARSER_CONTENT;
@@ -10970,12 +10970,12 @@
if (ctxt->errNo == 0)
ret = XML_ERR_INTERNAL_ERROR;
else
- ret = ctxt->errNo;
+ ret = (xmlParserErrors)ctxt->errNo;
} else {
- ret = 0;
+ ret = XML_ERR_OK;
}
- if ((lst != NULL) && (ret == 0)) {
+ if ((lst != NULL) && (ret == XML_ERR_OK)) {
xmlNodePtr cur;
/*
diff --git a/relaxng.c b/relaxng.c
index 9c788c2..b1c2e00 100644
--- a/relaxng.c
+++ b/relaxng.c
@@ -6085,7 +6085,7 @@
} else if (cur->depth == -4) {
ret = XML_RELAXNG_CONTENT_COMPLEX;
} else {
- ret = (xmlRelaxNGContentType) cur->depth + 15;
+ ret = (xmlRelaxNGContentType) (cur->depth + 15);
}
} else if (cur->type == XML_RELAXNG_ELEMENT) {
/*