lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-21 14:53:44 +03:00
Code Activity

finally converted the encoding module to the common error reporting

Browse Source 
* encoding.c error.c include/libxml/xmlerror.h: finally converted
  the encoding module to the common error reporting mechanism
* doc/* doc/html/libxml-xmlerror.html: rebuilt
Daniel
This commit is contained in:
Daniel Veillard
2005-08-24 12:46:09 +00:00
parent 8bda20f73c
commit 1fc3ed0280
9 changed files with 137 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
Wed Aug 24 14:43:34 CEST 2005 Daniel Veillard <daniel@veillard.com>
* encoding.c error.c include/libxml/xmlerror.h: finally converted
the encoding module to the common error reporting mechanism
* doc/* doc/html/libxml-xmlerror.html: rebuilt
Wed Aug 24 11:35:26 CEST 2005 Daniel Veillard <daniel@veillard.com>
* xpath.c: removed a potentially uninitialized variable error

6
doc/APIfiles.html
View File

@@ -1924,6 +1924,7 @@ A:link, A:visited, A:active { text-decoration: underline }
<a href="html/libxml-xmlerror.html#XML_FROM_FTP">XML_FROM_FTP</a><br />
<a href="html/libxml-xmlerror.html#XML_FROM_HTML">XML_FROM_HTML</a><br />
<a href="html/libxml-xmlerror.html#XML_FROM_HTTP">XML_FROM_HTTP</a><br />
<a href="html/libxml-xmlerror.html#XML_FROM_I18N">XML_FROM_I18N</a><br />
<a href="html/libxml-xmlerror.html#XML_FROM_IO">XML_FROM_IO</a><br />
<a href="html/libxml-xmlerror.html#XML_FROM_MEMORY">XML_FROM_MEMORY</a><br />
<a href="html/libxml-xmlerror.html#XML_FROM_MODULE">XML_FROM_MODULE</a><br />
@@ -1952,6 +1953,11 @@ A:link, A:visited, A:active { text-decoration: underline }
<a href="html/libxml-xmlerror.html#XML_HTTP_UNKNOWN_HOST">XML_HTTP_UNKNOWN_HOST</a><br />
<a href="html/libxml-xmlerror.html#XML_HTTP_URL_SYNTAX">XML_HTTP_URL_SYNTAX</a><br />
<a href="html/libxml-xmlerror.html#XML_HTTP_USE_IP">XML_HTTP_USE_IP</a><br />
<a href="html/libxml-xmlerror.html#XML_I18N_CONV_FAILED">XML_I18N_CONV_FAILED</a><br />
<a href="html/libxml-xmlerror.html#XML_I18N_EXCESS_HANDLER">XML_I18N_EXCESS_HANDLER</a><br />
<a href="html/libxml-xmlerror.html#XML_I18N_NO_HANDLER">XML_I18N_NO_HANDLER</a><br />
<a href="html/libxml-xmlerror.html#XML_I18N_NO_NAME">XML_I18N_NO_NAME</a><br />
<a href="html/libxml-xmlerror.html#XML_I18N_NO_OUTPUT">XML_I18N_NO_OUTPUT</a><br />
<a href="html/libxml-xmlerror.html#XML_IO_BUFFER_FULL">XML_IO_BUFFER_FULL</a><br />
<a href="html/libxml-xmlerror.html#XML_IO_EACCES">XML_IO_EACCES</a><br />
<a href="html/libxml-xmlerror.html#XML_IO_EADDRINUSE">XML_IO_EADDRINUSE</a><br />

6
doc/APIsymbols.html
View File

@@ -420,6 +420,7 @@ A:link, A:visited, A:active { text-decoration: underline }
<a href="html/libxml-xmlerror.html#XML_FROM_FTP">XML_FROM_FTP</a><br />
<a href="html/libxml-xmlerror.html#XML_FROM_HTML">XML_FROM_HTML</a><br />
<a href="html/libxml-xmlerror.html#XML_FROM_HTTP">XML_FROM_HTTP</a><br />
<a href="html/libxml-xmlerror.html#XML_FROM_I18N">XML_FROM_I18N</a><br />
<a href="html/libxml-xmlerror.html#XML_FROM_IO">XML_FROM_IO</a><br />
<a href="html/libxml-xmlerror.html#XML_FROM_MEMORY">XML_FROM_MEMORY</a><br />
<a href="html/libxml-xmlerror.html#XML_FROM_MODULE">XML_FROM_MODULE</a><br />
@@ -451,6 +452,11 @@ A:link, A:visited, A:active { text-decoration: underline }
<a href="html/libxml-xmlerror.html#XML_HTTP_UNKNOWN_HOST">XML_HTTP_UNKNOWN_HOST</a><br />
<a href="html/libxml-xmlerror.html#XML_HTTP_URL_SYNTAX">XML_HTTP_URL_SYNTAX</a><br />
<a href="html/libxml-xmlerror.html#XML_HTTP_USE_IP">XML_HTTP_USE_IP</a><br />
<a href="html/libxml-xmlerror.html#XML_I18N_CONV_FAILED">XML_I18N_CONV_FAILED</a><br />
<a href="html/libxml-xmlerror.html#XML_I18N_EXCESS_HANDLER">XML_I18N_EXCESS_HANDLER</a><br />
<a href="html/libxml-xmlerror.html#XML_I18N_NO_HANDLER">XML_I18N_NO_HANDLER</a><br />
<a href="html/libxml-xmlerror.html#XML_I18N_NO_NAME">XML_I18N_NO_NAME</a><br />
<a href="html/libxml-xmlerror.html#XML_I18N_NO_OUTPUT">XML_I18N_NO_OUTPUT</a><br />
<a href="html/libxml-entities.html#XML_INTERNAL_GENERAL_ENTITY">XML_INTERNAL_GENERAL_ENTITY</a><br />
<a href="html/libxml-entities.html#XML_INTERNAL_PARAMETER_ENTITY">XML_INTERNAL_PARAMETER_ENTITY</a><br />
<a href="html/libxml-entities.html#XML_INTERNAL_PREDEFINED_ENTITY">XML_INTERNAL_PREDEFINED_ENTITY</a><br />

10
doc/html/libxml-xmlerror.html
View File

@@ -79,6 +79,7 @@ void <a href="#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> (void * userD
<a name="XML_FROM_CHECK" id="XML_FROM_CHECK">XML_FROM_CHECK</a> = 24 : The error checking module
<a name="XML_FROM_WRITER" id="XML_FROM_WRITER">XML_FROM_WRITER</a> = 25 : The xmlwriter module
<a name="XML_FROM_MODULE" id="XML_FROM_MODULE">XML_FROM_MODULE</a> = 26 : The dynamically loaded module modul
<a name="XML_FROM_I18N" id="XML_FROM_I18N">XML_FROM_I18N</a> = 27 : The module handling character conversion
}
</pre><h3>Enum <a name="xmlErrorLevel" id="xmlErrorLevel">xmlErrorLevel</a></h3><pre class="programlisting">Enum xmlErrorLevel {
<a name="XML_ERR_NONE" id="XML_ERR_NONE">XML_ERR_NONE</a> = 0
@@ -795,8 +796,13 @@ void <a href="#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> (void * userD
<a name="XML_CHECK_OUTSIDE_DICT" id="XML_CHECK_OUTSIDE_DICT">XML_CHECK_OUTSIDE_DICT</a> = 5035 : 5035
<a name="XML_CHECK_WRONG_NAME" id="XML_CHECK_WRONG_NAME">XML_CHECK_WRONG_NAME</a> = 5036 : 5036
<a name="XML_CHECK_NAME_NOT_NULL" id="XML_CHECK_NAME_NOT_NULL">XML_CHECK_NAME_NOT_NULL</a> = 5037 : 5037
<a name="XML_CHECK_" id="XML_CHECK_">XML_CHECK_</a> = 5038 : 5033
<a name="XML_CHECK_X" id="XML_CHECK_X">XML_CHECK_X</a> = 5039 : 503
<a name="XML_I18N_NO_NAME" id="XML_I18N_NO_NAME">XML_I18N_NO_NAME</a> = 6000
<a name="XML_I18N_NO_HANDLER" id="XML_I18N_NO_HANDLER">XML_I18N_NO_HANDLER</a> = 6001 : 6001
<a name="XML_I18N_EXCESS_HANDLER" id="XML_I18N_EXCESS_HANDLER">XML_I18N_EXCESS_HANDLER</a> = 6002 : 6002
<a name="XML_I18N_CONV_FAILED" id="XML_I18N_CONV_FAILED">XML_I18N_CONV_FAILED</a> = 6003 : 6003
<a name="XML_I18N_NO_OUTPUT" id="XML_I18N_NO_OUTPUT">XML_I18N_NO_OUTPUT</a> = 6004 : 6004
<a name="XML_CHECK_" id="XML_CHECK_">XML_CHECK_</a> = 6005 : 5033
<a name="XML_CHECK_X" id="XML_CHECK_X">XML_CHECK_X</a> = 6006 : 503
}
</pre><h3><a name="initGenericErrorDefaultFunc" id="initGenericErrorDefaultFunc"></a>Function: initGenericErrorDefaultFunc</h3><pre class="programlisting">void initGenericErrorDefaultFunc (<a href="libxml-xmlerror.html#xmlGenericErrorFunc">xmlGenericErrorFunc</a> * handler)<br />
</pre><p>Set or reset (if NULL) the default handler for generic errors to the builtin error function.</p>

26
doc/libxml2-api.xml
View File

@@ -1945,6 +1945,7 @@
<exports symbol='XML_SCHEMAP_SRC_RESOLVE' type='enum'/>
<exports symbol='XML_SCHEMAV_CVC_FACET_VALID' type='enum'/>
<exports symbol='XML_SCHEMAP_RESTRICTION_NONAME_NOREF' type='enum'/>
<exports symbol='XML_I18N_NO_OUTPUT' type='enum'/>
<exports symbol='XML_CHECK_FOUND_ATTRIBUTE' type='enum'/>
<exports symbol='XML_ERR_STANDALONE_VALUE' type='enum'/>
<exports symbol='XML_SCHEMAP_REDEFINED_ATTR' type='enum'/>
@@ -2065,7 +2066,7 @@
<exports symbol='XML_SCHEMAV_CVC_ELT_4_3' type='enum'/>
<exports symbol='XML_FTP_ACCNT' type='enum'/>
<exports symbol='XML_SCHEMAV_CVC_ELT_4_1' type='enum'/>
<exports symbol='XML_SCHEMAP_EXTENSION_NO_BASE' type='enum'/>
<exports symbol='XML_RNGP_PAT_START_DATA' type='enum'/>
<exports symbol='XML_IO_ENOENT' type='enum'/>
<exports symbol='XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_3' type='enum'/>
<exports symbol='XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_2' type='enum'/>
@@ -2107,6 +2108,7 @@
<exports symbol='XML_DTD_MULTIPLE_ID' type='enum'/>
<exports symbol='XML_FROM_XPATH' type='enum'/>
<exports symbol='XML_TREE_INVALID_DEC' type='enum'/>
<exports symbol='XML_SCHEMAP_EXTENSION_NO_BASE' type='enum'/>
<exports symbol='XML_SCHEMAP_E_PROPS_CORRECT_5' type='enum'/>
<exports symbol='XML_SCHEMAP_E_PROPS_CORRECT_4' type='enum'/>
<exports symbol='XML_CHECK_FOUND_DOCTYPE' type='enum'/>
@@ -2145,7 +2147,7 @@
<exports symbol='XML_SCHEMAP_SRC_ELEMENT_3' type='enum'/>
<exports symbol='XML_SCHEMAP_UNKNOWN_REF' type='enum'/>
<exports symbol='XML_RNGP_PAT_DATA_EXCEPT_EMPTY' type='enum'/>
<exports symbol='XML_RNGP_PAT_START_DATA' type='enum'/>
<exports symbol='XML_FROM_I18N' type='enum'/>
<exports symbol='XML_DTD_MISSING_ATTRIBUTE' type='enum'/>
<exports symbol='XML_IO_EMFILE' type='enum'/>
<exports symbol='XML_RNGP_EMPTY_NOT_EMPTY' type='enum'/>
@@ -2184,6 +2186,7 @@
<exports symbol='XML_DTD_NOTATION_VALUE' type='enum'/>
<exports symbol='XML_SCHEMAP_ST_PROPS_CORRECT_2' type='enum'/>
<exports symbol='XML_SCHEMAP_ST_PROPS_CORRECT_3' type='enum'/>
<exports symbol='XML_I18N_NO_NAME' type='enum'/>
<exports symbol='XML_SCHEMAP_ST_PROPS_CORRECT_1' type='enum'/>
<exports symbol='XML_RNGP_EXCEPT_MISSING' type='enum'/>
<exports symbol='XML_SCHEMAV_CVC_MAXINCLUSIVE_VALID' type='enum'/>
@@ -2191,6 +2194,7 @@
<exports symbol='XML_DTD_MIXED_CORRUPT' type='enum'/>
<exports symbol='XML_ERR_ENTITY_BOUNDARY' type='enum'/>
<exports symbol='XML_SCHEMAP_ELEMFORMDEFAULT_VALUE' type='enum'/>
<exports symbol='XML_I18N_EXCESS_HANDLER' type='enum'/>
<exports symbol='XML_RNGP_DATA_CONTENT' type='enum'/>
<exports symbol='XML_ERR_STRING_NOT_STARTED' type='enum'/>
<exports symbol='XML_RNGP_EXCEPT_MULTIPLE' type='enum'/>
@@ -2352,7 +2356,7 @@
<exports symbol='XML_XPATH_INVALID_ARITY' type='enum'/>
<exports symbol='XML_RNGP_ERROR_TYPE_LIB' type='enum'/>
<exports symbol='XML_XPTR_EVAL_FAILED' type='enum'/>
<exports symbol='XML_RNGP_INCLUDE_RECURSE' type='enum'/>
<exports symbol='XML_DTD_NO_ROOT' type='enum'/>
<exports symbol='XML_SCHEMAP_IMPORT_REDEFINE_NSNAME' type='enum'/>
<exports symbol='XML_SCHEMAP_UNKNOWN_ATTR_CHILD' type='enum'/>
<exports symbol='XML_ERR_UNKNOWN_ENCODING' type='enum'/>
@@ -2379,6 +2383,7 @@
<exports symbol='XML_ERR_CHARREF_IN_DTD' type='enum'/>
<exports symbol='XML_IO_ENFILE' type='enum'/>
<exports symbol='XML_ERR_ENTITY_IS_PARAMETER' type='enum'/>
<exports symbol='XML_I18N_CONV_FAILED' type='enum'/>
<exports symbol='XML_CHECK_WRONG_PARENT' type='enum'/>
<exports symbol='XML_RNGP_PARENTREF_NO_NAME' type='enum'/>
<exports symbol='XML_IO_EPERM' type='enum'/>
@@ -2431,6 +2436,7 @@
<exports symbol='XML_SCHEMAP_UNKNOWN_CHOICE_CHILD' type='enum'/>
<exports symbol='XML_RNGP_ELEM_CONTENT_ERROR' type='enum'/>
<exports symbol='XML_SCHEMAV_HAVEDEFAULT' type='enum'/>
<exports symbol='XML_I18N_NO_HANDLER' type='enum'/>
<exports symbol='XML_RNGP_MISSING_HREF' type='enum'/>
<exports symbol='XML_ERR_PI_NOT_FINISHED' type='enum'/>
<exports symbol='XML_FROM_RELAXNGP' type='enum'/>
@@ -2551,7 +2557,7 @@
<exports symbol='XML_ERR_ELEMCONTENT_NOT_FINISHED' type='enum'/>
<exports symbol='XML_FROM_NAMESPACE' type='enum'/>
<exports symbol='XML_IO_EBUSY' type='enum'/>
<exports symbol='XML_DTD_NO_ROOT' type='enum'/>
<exports symbol='XML_RNGP_INCLUDE_RECURSE' type='enum'/>
<exports symbol='XML_ERR_INVALID_URI' type='enum'/>
<exports symbol='XML_IO_ESRCH' type='enum'/>
<exports symbol='XML_FROM_XPOINTER' type='enum'/>
@@ -4517,7 +4523,7 @@
<enum name='XML_CHAR_ENCODING_UTF16BE' file='encoding' value='3' type='xmlCharEncoding' info='UTF-16 big endian'/>
<enum name='XML_CHAR_ENCODING_UTF16LE' file='encoding' value='2' type='xmlCharEncoding' info='UTF-16 little endian'/>
<enum name='XML_CHAR_ENCODING_UTF8' file='encoding' value='1' type='xmlCharEncoding' info='UTF-8'/>
<enum name='XML_CHECK_' file='xmlerror' value='5038' type='xmlParserErrors' info='5033'/>
<enum name='XML_CHECK_' file='xmlerror' value='6005' type='xmlParserErrors' info='5033'/>
<enum name='XML_CHECK_ENTITY_TYPE' file='xmlerror' value='5012' type='xmlParserErrors' info='5012'/>
<enum name='XML_CHECK_FOUND_ATTRIBUTE' file='xmlerror' value='5001' type='xmlParserErrors' info='5001'/>
<enum name='XML_CHECK_FOUND_CDATA' file='xmlerror' value='5003' type='xmlParserErrors' info='5003'/>
@@ -4556,7 +4562,7 @@
<enum name='XML_CHECK_WRONG_NEXT' file='xmlerror' value='5021' type='xmlParserErrors' info='5021'/>
<enum name='XML_CHECK_WRONG_PARENT' file='xmlerror' value='5029' type='xmlParserErrors' info='5029'/>
<enum name='XML_CHECK_WRONG_PREV' file='xmlerror' value='5019' type='xmlParserErrors' info='5019'/>
<enum name='XML_CHECK_X' file='xmlerror' value='5039' type='xmlParserErrors' info=' 503'/>
<enum name='XML_CHECK_X' file='xmlerror' value='6006' type='xmlParserErrors' info=' 503'/>
<enum name='XML_COMMENT_NODE' file='tree' value='8' type='xmlElementType'/>
<enum name='XML_DOCB_DOCUMENT_NODE' file='tree' value='21' type='xmlElementType'/>
<enum name='XML_DOCUMENT_FRAG_NODE' file='tree' value='11' type='xmlElementType'/>
@@ -4742,9 +4748,10 @@
<enum name='XML_FROM_FTP' file='xmlerror' value='9' type='xmlErrorDomain' info='The FTP module'/>
<enum name='XML_FROM_HTML' file='xmlerror' value='5' type='xmlErrorDomain' info='The HTML parser'/>
<enum name='XML_FROM_HTTP' file='xmlerror' value='10' type='xmlErrorDomain' info='The HTTP module'/>
<enum name='XML_FROM_I18N' file='xmlerror' value='27' type='xmlErrorDomain' info=' The module handling character conversion'/>
<enum name='XML_FROM_IO' file='xmlerror' value='8' type='xmlErrorDomain' info='The Input/Output stack'/>
<enum name='XML_FROM_MEMORY' file='xmlerror' value='6' type='xmlErrorDomain' info='The memory allocator'/>
<enum name='XML_FROM_MODULE' file='xmlerror' value='26' type='xmlErrorDomain' info=' The dynamically loaded module modul'/>
<enum name='XML_FROM_MODULE' file='xmlerror' value='26' type='xmlErrorDomain' info='The dynamically loaded module modul'/>
<enum name='XML_FROM_NAMESPACE' file='xmlerror' value='3' type='xmlErrorDomain' info='The XML Namespace module'/>
<enum name='XML_FROM_NONE' file='xmlerror' value='0' type='xmlErrorDomain'/>
<enum name='XML_FROM_OUTPUT' file='xmlerror' value='7' type='xmlErrorDomain' info='The serialization code'/>
@@ -4771,6 +4778,11 @@
<enum name='XML_HTTP_UNKNOWN_HOST' file='xmlerror' value='2022' type='xmlParserErrors' info='2022'/>
<enum name='XML_HTTP_URL_SYNTAX' file='xmlerror' value='2020' type='xmlParserErrors'/>
<enum name='XML_HTTP_USE_IP' file='xmlerror' value='2021' type='xmlParserErrors' info='2021'/>
<enum name='XML_I18N_CONV_FAILED' file='xmlerror' value='6003' type='xmlParserErrors' info='6003'/>
<enum name='XML_I18N_EXCESS_HANDLER' file='xmlerror' value='6002' type='xmlParserErrors' info='6002'/>
<enum name='XML_I18N_NO_HANDLER' file='xmlerror' value='6001' type='xmlParserErrors' info='6001'/>
<enum name='XML_I18N_NO_NAME' file='xmlerror' value='6000' type='xmlParserErrors'/>
<enum name='XML_I18N_NO_OUTPUT' file='xmlerror' value='6004' type='xmlParserErrors' info='6004'/>
<enum name='XML_INTERNAL_GENERAL_ENTITY' file='entities' value='1' type='xmlEntityType'/>
<enum name='XML_INTERNAL_PARAMETER_ENTITY' file='entities' value='4' type='xmlEntityType'/>
<enum name='XML_INTERNAL_PREDEFINED_ENTITY' file='entities' value='6' type='xmlEntityType'/>

18
doc/libxml2-refs.xml
View File

@@ -414,6 +414,7 @@
<reference name='XML_FROM_FTP' href='html/libxml-xmlerror.html#XML_FROM_FTP'/>
<reference name='XML_FROM_HTML' href='html/libxml-xmlerror.html#XML_FROM_HTML'/>
<reference name='XML_FROM_HTTP' href='html/libxml-xmlerror.html#XML_FROM_HTTP'/>
<reference name='XML_FROM_I18N' href='html/libxml-xmlerror.html#XML_FROM_I18N'/>
<reference name='XML_FROM_IO' href='html/libxml-xmlerror.html#XML_FROM_IO'/>
<reference name='XML_FROM_MEMORY' href='html/libxml-xmlerror.html#XML_FROM_MEMORY'/>
<reference name='XML_FROM_MODULE' href='html/libxml-xmlerror.html#XML_FROM_MODULE'/>
@@ -445,6 +446,11 @@
<reference name='XML_HTTP_UNKNOWN_HOST' href='html/libxml-xmlerror.html#XML_HTTP_UNKNOWN_HOST'/>
<reference name='XML_HTTP_URL_SYNTAX' href='html/libxml-xmlerror.html#XML_HTTP_URL_SYNTAX'/>
<reference name='XML_HTTP_USE_IP' href='html/libxml-xmlerror.html#XML_HTTP_USE_IP'/>
<reference name='XML_I18N_CONV_FAILED' href='html/libxml-xmlerror.html#XML_I18N_CONV_FAILED'/>
<reference name='XML_I18N_EXCESS_HANDLER' href='html/libxml-xmlerror.html#XML_I18N_EXCESS_HANDLER'/>
<reference name='XML_I18N_NO_HANDLER' href='html/libxml-xmlerror.html#XML_I18N_NO_HANDLER'/>
<reference name='XML_I18N_NO_NAME' href='html/libxml-xmlerror.html#XML_I18N_NO_NAME'/>
<reference name='XML_I18N_NO_OUTPUT' href='html/libxml-xmlerror.html#XML_I18N_NO_OUTPUT'/>
<reference name='XML_INTERNAL_GENERAL_ENTITY' href='html/libxml-entities.html#XML_INTERNAL_GENERAL_ENTITY'/>
<reference name='XML_INTERNAL_PARAMETER_ENTITY' href='html/libxml-entities.html#XML_INTERNAL_PARAMETER_ENTITY'/>
<reference name='XML_INTERNAL_PREDEFINED_ENTITY' href='html/libxml-entities.html#XML_INTERNAL_PREDEFINED_ENTITY'/>
@@ -3845,6 +3851,7 @@
<ref name='XML_FROM_FTP'/>
<ref name='XML_FROM_HTML'/>
<ref name='XML_FROM_HTTP'/>
<ref name='XML_FROM_I18N'/>
<ref name='XML_FROM_IO'/>
<ref name='XML_FROM_MEMORY'/>
<ref name='XML_FROM_MODULE'/>
@@ -3876,6 +3883,11 @@
<ref name='XML_HTTP_UNKNOWN_HOST'/>
<ref name='XML_HTTP_URL_SYNTAX'/>
<ref name='XML_HTTP_USE_IP'/>
<ref name='XML_I18N_CONV_FAILED'/>
<ref name='XML_I18N_EXCESS_HANDLER'/>
<ref name='XML_I18N_NO_HANDLER'/>
<ref name='XML_I18N_NO_NAME'/>
<ref name='XML_I18N_NO_OUTPUT'/>
<ref name='XML_INTERNAL_GENERAL_ENTITY'/>
<ref name='XML_INTERNAL_PARAMETER_ENTITY'/>
<ref name='XML_INTERNAL_PREDEFINED_ENTITY'/>
@@ -12262,6 +12274,7 @@
<ref name='XML_FROM_FTP'/>
<ref name='XML_FROM_HTML'/>
<ref name='XML_FROM_HTTP'/>
<ref name='XML_FROM_I18N'/>
<ref name='XML_FROM_IO'/>
<ref name='XML_FROM_MEMORY'/>
<ref name='XML_FROM_MODULE'/>
@@ -12290,6 +12303,11 @@
<ref name='XML_HTTP_UNKNOWN_HOST'/>
<ref name='XML_HTTP_URL_SYNTAX'/>
<ref name='XML_HTTP_USE_IP'/>
<ref name='XML_I18N_CONV_FAILED'/>
<ref name='XML_I18N_EXCESS_HANDLER'/>
<ref name='XML_I18N_NO_HANDLER'/>
<ref name='XML_I18N_NO_NAME'/>
<ref name='XML_I18N_NO_OUTPUT'/>
<ref name='XML_IO_BUFFER_FULL'/>
<ref name='XML_IO_EACCES'/>
<ref name='XML_IO_EADDRINUSE'/>

87
encoding.c
View File

@@ -70,6 +70,32 @@ static void xmlRegisterCharEncodingHandlersISO8859x (void);
static int xmlLittleEndian = 1;
/**
* xmlEncodingErrMemory:
* @extra: extra informations
*
* Handle an out of memory condition
*/
static void
xmlEncodingErrMemory(const char *extra)
{
__xmlSimpleError(XML_FROM_I18N, XML_ERR_NO_MEMORY, NULL, NULL, extra);
}
/**
* xmlErrEncoding:
* @error: the error number
* @msg: the error message
*
* n encoding error
*/
static void
xmlEncodingErr(xmlParserErrors error, const char *msg, const char *val)
{
__xmlRaiseError(NULL, NULL, NULL, NULL, NULL,
XML_FROM_I18N, error, XML_ERR_FATAL,
NULL, 0, val, NULL, NULL, 0, 0, msg, val);
}
/************************************************************************
* *
@@ -1252,8 +1278,8 @@ xmlNewCharEncodingHandler(const char *name,
* Keep only the uppercase version of the encoding.
*/
if (name == NULL) {
xmlGenericError(xmlGenericErrorContext,
"xmlNewCharEncodingHandler : no name !\n");
xmlEncodingErr(XML_I18N_NO_NAME,
"xmlNewCharEncodingHandler : no name !\n", NULL);
return(NULL);
}
for (i = 0;i < 499;i++) {
@@ -1263,8 +1289,7 @@ xmlNewCharEncodingHandler(const char *name,
upper[i] = 0;
up = xmlMemStrdup(upper);
if (up == NULL) {
xmlGenericError(xmlGenericErrorContext,
"xmlNewCharEncodingHandler : out of memory !\n");
xmlEncodingErrMemory("xmlNewCharEncodingHandler : out of memory !\n");
return(NULL);
}
@@ -1275,8 +1300,7 @@ xmlNewCharEncodingHandler(const char *name,
xmlMalloc(sizeof(xmlCharEncodingHandler));
if (handler == NULL) {
xmlFree(up);
xmlGenericError(xmlGenericErrorContext,
"xmlNewCharEncodingHandler : out of memory !\n");
xmlEncodingErrMemory("xmlNewCharEncodingHandler : out of memory !\n");
return(NULL);
}
handler->input = input;
@@ -1319,12 +1343,13 @@ xmlInitCharEncodingHandlers(void) {
if (*ptr == 0x12) xmlLittleEndian = 0;
else if (*ptr == 0x34) xmlLittleEndian = 1;
else xmlGenericError(xmlGenericErrorContext,
"Odd problem at endianness detection\n");
else {
xmlEncodingErr(XML_ERR_INTERNAL_ERROR,
"Odd problem at endianness detection\n", NULL);
}
if (handlers == NULL) {
xmlGenericError(xmlGenericErrorContext,
"xmlInitCharEncodingHandlers : out of memory !\n");
xmlEncodingErrMemory("xmlInitCharEncodingHandlers : out of memory !\n");
return;
}
xmlNewCharEncodingHandler("UTF-8", UTF8ToUTF8, UTF8ToUTF8);
@@ -1394,16 +1419,15 @@ void
xmlRegisterCharEncodingHandler(xmlCharEncodingHandlerPtr handler) {
if (handlers == NULL) xmlInitCharEncodingHandlers();
if (handler == NULL) {
xmlGenericError(xmlGenericErrorContext,
"xmlRegisterCharEncodingHandler: NULL handler !\n");
xmlEncodingErr(XML_I18N_NO_HANDLER,
"xmlRegisterCharEncodingHandler: NULL handler !\n", NULL);
return;
}
if (nbCharEncodingHandler >= MAX_ENCODING_HANDLERS) {
xmlGenericError(xmlGenericErrorContext,
"xmlRegisterCharEncodingHandler: Too many handler registered\n");
xmlGenericError(xmlGenericErrorContext,
"\tincrease MAX_ENCODING_HANDLERS : %s\n", __FILE__);
xmlEncodingErr(XML_I18N_EXCESS_HANDLER,
"xmlRegisterCharEncodingHandler: Too many handler registered, see %s\n",
"MAX_ENCODING_HANDLERS");
return;
}
handlers[nbCharEncodingHandler++] = handler;
@@ -1612,7 +1636,7 @@ xmlFindCharEncodingHandler(const char *name) {
#endif
return enc;
} else if ((icv_in != (iconv_t) -1) || icv_out != (iconv_t) -1) {
xmlGenericError(xmlGenericErrorContext,
xmlEncodingErr(XML_ERR_INTERNAL_ERROR,
"iconv : problems with filters for '%s'\n", name);
}
#endif /* LIBXML_ICONV_ENABLED */
@@ -1878,13 +1902,17 @@ xmlCharEncInFunc(xmlCharEncodingHandler * handler, xmlBufferPtr out,
toconv, written, in->use);
#endif
break;
case -2:
xmlGenericError(xmlGenericErrorContext,
"input conversion failed due to input error\n");
xmlGenericError(xmlGenericErrorContext,
"Bytes: 0x%02X 0x%02X 0x%02X 0x%02X\n",
case -2: {
char buf[50];
snprintf(buf, 49, "0x%02X 0x%02X 0x%02X 0x%02X",
in->content[0], in->content[1],
in->content[2], in->content[3]);
buf[49] = 0;
xmlEncodingErr(XML_I18N_CONV_FAILED,
"input conversion failed due to input error, bytes %s\n",
buf);
}
}
/*
* Ignore when input buffer is not on a boundary
@@ -1997,8 +2025,8 @@ retry:
}
#endif /* LIBXML_ICONV_ENABLED */
else {
xmlGenericError(xmlGenericErrorContext,
"xmlCharEncOutFunc: no output function !\n");
xmlEncodingErr(XML_I18N_NO_OUTPUT,
"xmlCharEncOutFunc: no output function !\n", NULL);
return(-1);
}
@@ -2055,12 +2083,15 @@ retry:
goto retry;
} else {
xmlGenericError(xmlGenericErrorContext,
"output conversion failed due to conv error\n");
xmlGenericError(xmlGenericErrorContext,
"Bytes: 0x%02X 0x%02X 0x%02X 0x%02X\n",
char buf[50];
snprintf(buf, 49, "0x%02X 0x%02X 0x%02X 0x%02X",
in->content[0], in->content[1],
in->content[2], in->content[3]);
buf[49] = 0;
xmlEncodingErr(XML_I18N_CONV_FAILED,
"output conversion failed due to conv error, bytes %s\n",
buf);
in->content[0] = ' ';
}
break;

3
error.c
View File

@@ -354,6 +354,9 @@ xmlReportError(xmlErrorPtr err, xmlParserCtxtPtr ctxt, const char *str,
case XML_FROM_XSLT:
channel(data, "XSLT ");
break;
case XML_FROM_I18N:
channel(data, "encoding ");
break;
default:
break;
}

10
include/libxml/xmlerror.h
View File

@@ -60,7 +60,8 @@ typedef enum {
XML_FROM_VALID, /* The XML DTD validation with valid context */
XML_FROM_CHECK, /* The error checking module */
XML_FROM_WRITER, /* The xmlwriter module */
XML_FROM_MODULE /* The dynamically loaded module module*/
XML_FROM_MODULE, /* The dynamically loaded module module*/
XML_FROM_I18N /* The module handling character conversion */
} xmlErrorDomain;
/**
@@ -800,7 +801,12 @@ typedef enum {
XML_CHECK_NOT_NCNAME, /* 5034 */
XML_CHECK_OUTSIDE_DICT, /* 5035 */
XML_CHECK_WRONG_NAME, /* 5036 */
XML_CHECK_NAME_NOT_NULL /* 5037 */
XML_CHECK_NAME_NOT_NULL, /* 5037 */
XML_I18N_NO_NAME = 6000,
XML_I18N_NO_HANDLER, /* 6001 */
XML_I18N_EXCESS_HANDLER, /* 6002 */
XML_I18N_CONV_FAILED, /* 6003 */
XML_I18N_NO_OUTPUT /* 6004 */
#if 0
XML_CHECK_, /* 5033 */
XML_CHECK_X /* 503 */