Commit 4e1c2db8 authored by William M. Brack's avatar William M. Brack
Browse files

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
parent b6b36d37
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
......
......@@ -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);
......
......@@ -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,
......
......@@ -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");
}
......
......@@ -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 {
/*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment