preparing release 2.6.15 cleanups Daniel
* ChangeLog NEWS configure.in doc/*: preparing release 2.6.15
* debugXML.c nanoftp.c xmlschemas.c xmlschemastypes.c: cleanups
Daniel
diff --git a/debugXML.c b/debugXML.c
index d0e17c2..94be70d 100644
--- a/debugXML.c
+++ b/debugXML.c
@@ -62,6 +62,7 @@
ctxt->doc = NULL;
ctxt->node = NULL;
ctxt->dict = NULL;
+ ctxt->nodict = 0;
for (i = 0; i < 100; i++)
ctxt->shift[i] = ' ';
ctxt->shift[100] = 0;
@@ -279,8 +280,12 @@
} else {
dict = doc->dict;
if ((dict == NULL) && (ctxt->nodict == 0)) {
- xmlDebugErr(ctxt, XML_CHECK_NO_DICT,
- "Document has no dictionnary\n");
+#if 0
+ /* desactivated right now as it raises too many errors */
+ if (doc->type == XML_DOCUMENT_NODE)
+ xmlDebugErr(ctxt, XML_CHECK_NO_DICT,
+ "Document has no dictionnary\n");
+#endif
ctxt->nodict = 1;
}
if (ctxt->doc == NULL)
@@ -357,7 +362,8 @@
break;
/* some case of entity substitution can lead to this */
if ((ctxt->dict != NULL) &&
- (node->name == xmlDictLookup(ctxt->dict, "nbktext", 7)))
+ (node->name == xmlDictLookup(ctxt->dict, BAD_CAST "nbktext",
+ 7)))
break;
xmlDebugErr3(ctxt, XML_CHECK_WRONG_NAME,