small fix fixing bug #58539 reported by coolo, in entity substitution mode
* SAX.c: small fix fixing bug #58539 reported by coolo, in
entity substitution mode text at the end of the entity might
be added due to text coalescing.
* nanoftp.c parser.c: small cleanup
Daniel
diff --git a/parser.c b/parser.c
index f308617..9aa091c 100644
--- a/parser.c
+++ b/parser.c
@@ -28,9 +28,6 @@
* See Copyright for the status of this software.
*
* daniel@veillard.com
- *
- * 14 Nov 2000 ht - truncated definitions of xmlSubstituteEntitiesDefaultValue
- * and xmlDoValidityCheckingDefaultValue for VMS
*/
#include "libxml.h"
@@ -5470,7 +5467,7 @@
ctxt->errNo = XML_ERR_NAME_REQUIRED;
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
ctxt->sax->error(ctxt->userData,
- "xmlParseEntityRef: no name\n");
+ "xmlParseStringEntityRef: no name\n");
ctxt->wellFormed = 0;
ctxt->disableSAX = 1;
} else {
@@ -5602,7 +5599,7 @@
ctxt->errNo = XML_ERR_ENTITYREF_SEMICOL_MISSING;
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
ctxt->sax->error(ctxt->userData,
- "xmlParseEntityRef: expecting ';'\n");
+ "xmlParseStringEntityRef: expecting ';'\n");
ctxt->wellFormed = 0;
ctxt->disableSAX = 1;
}