diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2004-08-16 00:39:03 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2004-08-16 00:39:03 +0000 |
| commit | 29b1748205897f727696b62fdba333efc9671440 (patch) | |
| tree | 0fbd0025ff3d6fcd286b03834cba7d4d9c3cf1ad /parserInternals.c | |
| parent | 774a3bd4cd32c6515c5ef7b13c949c30499f74b3 (diff) | |
| download | libxml2-29b1748205897f727696b62fdba333efc9671440.tar.gz | |
small typo pointed out by Mike Hommey slightly improved the --c14n
* xmlIO.c: small typo pointed out by Mike Hommey
* doc/xmllint.xml, xmllint.html, xmllint.1: slightly improved
the --c14n description, c.f. #144675 .
* nanohttp.c nanoftp.c: applied a first simple patch from
Mike Hommey for $no_proxy, c.f. #133470
* parserInternals.c include/libxml/parserInternals.h
include/libxml/xmlerror.h: cleanup to avoid 'error' identifier
in includes #
* parser.c SAX2.c debugXML.c include/libxml/parser.h:
first version of the inplementation of parsing within
the context of a node in the tree #142359, new function
xmlParseInNodeContext(), added support at the xmllint --shell
level as the "set" function
* test/scripts/set* result/scripts/* Makefile.am: extended
the script based regression tests to instrument the new function.
Daniel
Diffstat (limited to 'parserInternals.c')
| -rw-r--r-- | parserInternals.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/parserInternals.c b/parserInternals.c index d03e3d4f..09f8bb8a 100644 --- a/parserInternals.c +++ b/parserInternals.c @@ -127,7 +127,7 @@ xmlErrMemory(xmlParserCtxtPtr ctxt, const char *extra) /** * __xmlErrEncoding: * @ctxt: an XML parser context - * @error: the error number + * @xmlerr: the error number * @msg: the error message * @str1: an string info * @str2: an string info @@ -135,16 +135,16 @@ xmlErrMemory(xmlParserCtxtPtr ctxt, const char *extra) * Handle an encoding error */ void -__xmlErrEncoding(xmlParserCtxtPtr ctxt, xmlParserErrors error, +__xmlErrEncoding(xmlParserCtxtPtr ctxt, xmlParserErrors xmlerr, const char *msg, const xmlChar * str1, const xmlChar * str2) { if ((ctxt != NULL) && (ctxt->disableSAX != 0) && (ctxt->instate == XML_PARSER_EOF)) return; if (ctxt != NULL) - ctxt->errNo = error; + ctxt->errNo = xmlerr; __xmlRaiseError(NULL, NULL, NULL, - ctxt, NULL, XML_FROM_PARSER, error, XML_ERR_FATAL, + ctxt, NULL, XML_FROM_PARSER, xmlerr, XML_ERR_FATAL, NULL, 0, (const char *) str1, (const char *) str2, NULL, 0, 0, msg, str1, str2); if (ctxt != NULL) { |