diff --git a/include/libxml/parser.h b/include/libxml/parser.h index 046b3891..6853eb0f 100644 --- a/include/libxml/parser.h +++ b/include/libxml/parser.h @@ -1082,31 +1082,42 @@ XMLPUBFUN xmlDocPtr xmlParseMemory (const char *buffer, int size); #endif /* LIBXML_SAX1_ENABLED */ -XML_DEPRECATED XMLPUBFUN int +XML_DEPRECATED +XMLPUBFUN int xmlSubstituteEntitiesDefault(int val); -XML_DEPRECATED XMLPUBFUN int +XML_DEPRECATED +XMLPUBFUN int xmlThrDefSubstituteEntitiesDefaultValue(int v); XMLPUBFUN int xmlKeepBlanksDefault (int val); -XML_DEPRECATED XMLPUBFUN int +XML_DEPRECATED +XMLPUBFUN int xmlThrDefKeepBlanksDefaultValue(int v); XMLPUBFUN void xmlStopParser (xmlParserCtxtPtr ctxt); -XML_DEPRECATED XMLPUBFUN int +XML_DEPRECATED +XMLPUBFUN int xmlPedanticParserDefault(int val); -XML_DEPRECATED XMLPUBFUN int +XML_DEPRECATED +XMLPUBFUN int xmlThrDefPedanticParserDefaultValue(int v); -XML_DEPRECATED XMLPUBFUN int +XML_DEPRECATED +XMLPUBFUN int xmlLineNumbersDefault (int val); -XML_DEPRECATED XMLPUBFUN int +XML_DEPRECATED +XMLPUBFUN int xmlThrDefLineNumbersDefaultValue(int v); -XML_DEPRECATED XMLPUBFUN int +XML_DEPRECATED +XMLPUBFUN int xmlThrDefDoValidityCheckingDefaultValue(int v); -XML_DEPRECATED XMLPUBFUN int +XML_DEPRECATED +XMLPUBFUN int xmlThrDefGetWarningsDefaultValue(int v); -XML_DEPRECATED XMLPUBFUN int +XML_DEPRECATED +XMLPUBFUN int xmlThrDefLoadExtDtdDefaultValue(int v); -XML_DEPRECATED XMLPUBFUN int +XML_DEPRECATED +XMLPUBFUN int xmlThrDefParserDebugEntities(int v); #ifdef LIBXML_SAX1_ENABLED @@ -1130,6 +1141,7 @@ XMLPUBFUN xmlDocPtr */ XMLPUBFUN int xmlParseDocument (xmlParserCtxtPtr ctxt); +XML_DEPRECATED XMLPUBFUN int xmlParseExtParsedEnt (xmlParserCtxtPtr ctxt); #ifdef LIBXML_SAX1_ENABLED @@ -1331,16 +1343,21 @@ XMLPUBFUN xmlParserInputPtr /* * Node infos. */ +XML_DEPRECATED XMLPUBFUN const xmlParserNodeInfo* xmlParserFindNodeInfo (xmlParserCtxtPtr ctxt, xmlNodePtr node); +XML_DEPRECATED XMLPUBFUN void xmlInitNodeInfoSeq (xmlParserNodeInfoSeqPtr seq); +XML_DEPRECATED XMLPUBFUN void xmlClearNodeInfoSeq (xmlParserNodeInfoSeqPtr seq); +XML_DEPRECATED XMLPUBFUN unsigned long xmlParserFindNodeInfoIndex(xmlParserNodeInfoSeqPtr seq, xmlNodePtr node); +XML_DEPRECATED XMLPUBFUN void xmlParserAddNodeInfo (xmlParserCtxtPtr ctxt, xmlParserNodeInfoPtr info); diff --git a/parser.c b/parser.c index be1686d4..7fb4af39 100644 --- a/parser.c +++ b/parser.c @@ -10795,6 +10795,8 @@ xmlParseDocument(xmlParserCtxtPtr ctxt) { * xmlParseExtParsedEnt: * @ctxt: an XML parser context * + * DEPRECATED: Internal function, don't use. + * * parse a general parsed entity * An external general parsed entity is well-formed if it matches the * production labeled extParsedEnt. diff --git a/python/generator.py b/python/generator.py index 9cad6178..9efdbab4 100755 --- a/python/generator.py +++ b/python/generator.py @@ -343,6 +343,7 @@ deprecated_funcs = { 'xmlParseEntity': True, 'xmlParseEntityDecl': True, 'xmlParseEntityRef': True, + 'xmlParseExtParsedEnt': True, 'xmlParseExternalSubset': True, 'xmlParseMarkupDecl': True, 'xmlParseMisc': True,