[2.7] bpo-30694: Upgrade Modules/expat/ to libexpat 2.2.1 (#2300) (#2…

[2.7] bpo-30694: Upgrade Modules/expat/ to libexpat 2.2.1 (#2300) (#2… · python/cpython@2ada64d

@@ -95,7 +95,9 @@ enum XML_Error {

9595/* Added in 2.0. */9696 XML_ERROR_RESERVED_PREFIX_XML,9797 XML_ERROR_RESERVED_PREFIX_XMLNS,98- XML_ERROR_RESERVED_NAMESPACE_URI98+ XML_ERROR_RESERVED_NAMESPACE_URI,99+/* Added in 2.2.1. */100+ XML_ERROR_INVALID_ARGUMENT99101};100102101103enum XML_Content_Type {

@@ -706,6 +708,7 @@ XML_UseParserAsHandlerArg(XML_Parser parser);

706708 be called, despite an external subset being parsed.707709 Note: If XML_DTD is not defined when Expat is compiled, returns708710 XML_ERROR_FEATURE_REQUIRES_XML_DTD.711+ Note: If parser == NULL, returns XML_ERROR_INVALID_ARGUMENT.709712*/710713XMLPARSEAPI(enum XML_Error)711714XML_UseForeignDTD(XML_Parser parser, XML_Bool useDTD);

@@ -729,15 +732,16 @@ XML_GetBase(XML_Parser parser);

729732 to the XML_StartElementHandler that were specified in the start-tag730733 rather than defaulted. Each attribute/value pair counts as 2; thus731734 this correspondds to an index into the atts array passed to the732- XML_StartElementHandler.735+ XML_StartElementHandler. Returns -1 if parser == NULL.733736*/734737XMLPARSEAPI(int)735738XML_GetSpecifiedAttributeCount(XML_Parser parser);736739737740/* Returns the index of the ID attribute passed in the last call to738- XML_StartElementHandler, or -1 if there is no ID attribute. Each739- attribute/value pair counts as 2; thus this correspondds to an740- index into the atts array passed to the XML_StartElementHandler.741+ XML_StartElementHandler, or -1 if there is no ID attribute or742+ parser == NULL. Each attribute/value pair counts as 2; thus this743+ correspondds to an index into the atts array passed to the744+ XML_StartElementHandler.741745*/742746XMLPARSEAPI(int)743747XML_GetIdAttributeIndex(XML_Parser parser);

@@ -901,6 +905,7 @@ enum XML_ParamEntityParsing {

901905 entities is requested; otherwise it will return non-zero.902906 Note: If XML_SetParamEntityParsing is called after XML_Parse or903907 XML_ParseBuffer, then it has no effect and will always return 0.908+ Note: If parser == NULL, the function will do nothing and return 0.904909*/905910XMLPARSEAPI(int)906911XML_SetParamEntityParsing(XML_Parser parser,

@@ -910,6 +915,7 @@ XML_SetParamEntityParsing(XML_Parser parser,

910915 Helps in preventing DoS attacks based on predicting hash911916 function behavior. This must be called before parsing is started.912917 Returns 1 if successful, 0 when called after parsing has started.918+ Note: If parser == NULL, the function will do nothing and return 0.913919*/914920XMLPARSEAPI(int)915921XML_SetHashSalt(XML_Parser parser,

@@ -936,6 +942,10 @@ XML_GetErrorCode(XML_Parser parser);

936942 the location is the location of the character at which the error937943 was detected; otherwise the location is the location of the last938944 parse event, as described above.945+946+ Note: XML_GetCurrentLineNumber and XML_GetCurrentColumnNumber947+ return 0 to indicate an error.948+ Note: XML_GetCurrentByteIndex returns -1 to indicate an error.939949*/940950XMLPARSEAPI(XML_Size) XML_GetCurrentLineNumber(XML_Parser parser);941951XMLPARSEAPI(XML_Size) XML_GetCurrentColumnNumber(XML_Parser parser);

@@ -1039,7 +1049,7 @@ XML_GetFeatureList(void);

10391049*/10401050#define XML_MAJOR_VERSION 210411051#define XML_MINOR_VERSION 21042-#define XML_MICRO_VERSION 01052+#define XML_MICRO_VERSION 11043105310441054#ifdef __cplusplus10451055}