From 4e1c2db89ed0f49567682e1498ce19bd2bfa7e4f Mon Sep 17 00:00:00 2001
From: "William M. Brack" <wbrack@src.gnome.org>
Date: Fri, 11 Feb 2005 10:58:55 +0000
Subject: [PATCH] fixed compilation warning changed xmlWarningMsg so
 ctxt->errNo is not set

* dict.c: fixed compilation warning
* parser.c: changed xmlWarningMsg so ctxt->errNo is not set
* xmllint.c: changed to return non-zero status if error
  on xinclude processing
* xmlsave.c: minor deletion of a redundant condition statement
---
 ChangeLog | 8 ++++++++
 dict.c    | 4 ++--
 parser.c  | 1 -
 xmllint.c | 3 ++-
 xmlsave.c | 4 +---
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8f48d6e1..9ec4cc16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Feb 11 18:37:22 HKT 2005 William Brack <wbrack@mmm.com.hk>
+
+	* dict.c: fixed compilation warning
+	* parser.c: changed xmlWarningMsg so ctxt->errNo is not set
+	* xmllint.c: changed to return non-zero status if error
+	  on xinclude processing
+	* xmlsave.c: minor deletion of a redundant condition statement
+	
 Wed Feb  9 17:47:40 CET 2005 Daniel Veillard <daniel@veillard.com>
 
 	* tree.c: applied patch to xmlSetNsProp from Mike Hommey
diff --git a/dict.c b/dict.c
index 8b1b121f..c8e06d35 100644
--- a/dict.c
+++ b/dict.c
@@ -82,13 +82,13 @@ static xmlRMutexPtr xmlDictMutex = NULL;
 static int xmlDictInitialized = 0;
 
 /**
- * xmlInitializeCatalog:
+ * xmlInitializeDict:
  *
  * Do the dictionary mutex initialization.
  * this function is not thread safe, initialization should
  * preferably be done once at startup
  */
-static int xmlInitializeDict() {
+static int xmlInitializeDict(void) {
     if (xmlDictInitialized)
         return(1);
 
diff --git a/parser.c b/parser.c
index 9aa9698c..f382087f 100644
--- a/parser.c
+++ b/parser.c
@@ -410,7 +410,6 @@ xmlWarningMsg(xmlParserCtxtPtr ctxt, xmlParserErrors error,
     if ((ctxt != NULL) && (ctxt->disableSAX != 0) &&
         (ctxt->instate == XML_PARSER_EOF))
 	return;
-    ctxt->errNo = error;
     if ((ctxt->sax != NULL) && (ctxt->sax->initialized == XML_SAX2_MAGIC))
         schannel = ctxt->sax->serror;
     __xmlRaiseError(schannel,
diff --git a/xmllint.c b/xmllint.c
index dea8d5bf..f691daef 100644
--- a/xmllint.c
+++ b/xmllint.c
@@ -1341,7 +1341,8 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
 	if ((timing) && (!repeat)) {
 	    startTimer();
 	}
-	xmlXIncludeProcessFlags(doc, options);
+	if (xmlXIncludeProcessFlags(doc, options) < 0)
+	    progresult = XMLLINT_ERR_UNCLASS;
 	if ((timing) && (!repeat)) {
 	    endTimer("Xinclude processing");
 	}
diff --git a/xmlsave.c b/xmlsave.c
index a774bc83..aecbdfd6 100644
--- a/xmlsave.c
+++ b/xmlsave.c
@@ -670,9 +670,7 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
     }
     if (cur->type == XML_TEXT_NODE) {
 	if (cur->content != NULL) {
-	    if ((cur->name == xmlStringText) ||
-		(cur->name != xmlStringTextNoenc)) {
-
+	    if (cur->name != xmlStringTextNoenc) {
                 xmlOutputBufferWriteEscape(buf, cur->content, ctxt->escape);
 	    } else {
 		/*