lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00
Code Activity

parser: Deprecate more internal functions

Browse Source
This commit is contained in:
Nick Wellnhofer
2023-03-13 19:38:41 +01:00
parent b51b99ef83
commit 3ffcc03b16
5 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/libxml/parserInternals.h
View File

@ -330,6 +330,7 @@ XMLPUBFUN int
XMLPUBFUN xmlParserInputPtr XMLPUBFUN xmlParserInputPtr
xmlNewStringInputStream (xmlParserCtxtPtr ctxt, xmlNewStringInputStream (xmlParserCtxtPtr ctxt,
const xmlChar *buffer); const xmlChar *buffer);
XML_DEPRECATED
XMLPUBFUN xmlParserInputPtr XMLPUBFUN xmlParserInputPtr
xmlNewEntityInputStream (xmlParserCtxtPtr ctxt, xmlNewEntityInputStream (xmlParserCtxtPtr ctxt,
xmlEntityPtr entity); xmlEntityPtr entity);
@ -551,29 +552,38 @@ XMLPUBFUN xmlChar *
/* /*
* Generated by MACROS on top of parser.c c.f. PUSH_AND_POP. * Generated by MACROS on top of parser.c c.f. PUSH_AND_POP.
*/ */
XML_DEPRECATED
XMLPUBFUN int nodePush (xmlParserCtxtPtr ctxt, XMLPUBFUN int nodePush (xmlParserCtxtPtr ctxt,
xmlNodePtr value); xmlNodePtr value);
XML_DEPRECATED
XMLPUBFUN xmlNodePtr nodePop (xmlParserCtxtPtr ctxt); XMLPUBFUN xmlNodePtr nodePop (xmlParserCtxtPtr ctxt);
XMLPUBFUN int inputPush (xmlParserCtxtPtr ctxt, XMLPUBFUN int inputPush (xmlParserCtxtPtr ctxt,
xmlParserInputPtr value); xmlParserInputPtr value);
XMLPUBFUN xmlParserInputPtr inputPop (xmlParserCtxtPtr ctxt); XMLPUBFUN xmlParserInputPtr inputPop (xmlParserCtxtPtr ctxt);
XML_DEPRECATED
XMLPUBFUN const xmlChar * namePop (xmlParserCtxtPtr ctxt); XMLPUBFUN const xmlChar * namePop (xmlParserCtxtPtr ctxt);
XML_DEPRECATED
XMLPUBFUN int namePush (xmlParserCtxtPtr ctxt, XMLPUBFUN int namePush (xmlParserCtxtPtr ctxt,
const xmlChar *value); const xmlChar *value);
/* /*
* other commodities shared between parser.c and parserInternals. * other commodities shared between parser.c and parserInternals.
*/ */
XML_DEPRECATED
XMLPUBFUN int xmlSkipBlankChars (xmlParserCtxtPtr ctxt); XMLPUBFUN int xmlSkipBlankChars (xmlParserCtxtPtr ctxt);
XML_DEPRECATED
XMLPUBFUN int xmlStringCurrentChar (xmlParserCtxtPtr ctxt, XMLPUBFUN int xmlStringCurrentChar (xmlParserCtxtPtr ctxt,
const xmlChar *cur, const xmlChar *cur,
int *len); int *len);
XML_DEPRECATED
XMLPUBFUN void xmlParserHandlePEReference(xmlParserCtxtPtr ctxt); XMLPUBFUN void xmlParserHandlePEReference(xmlParserCtxtPtr ctxt);
XML_DEPRECATED
XMLPUBFUN int xmlCheckLanguageID (const xmlChar *lang); XMLPUBFUN int xmlCheckLanguageID (const xmlChar *lang);
/* /*
* Really core function shared with HTML parser. * Really core function shared with HTML parser.
*/ */
XML_DEPRECATED
XMLPUBFUN int xmlCurrentChar (xmlParserCtxtPtr ctxt, XMLPUBFUN int xmlCurrentChar (xmlParserCtxtPtr ctxt,
int *len); int *len);
XMLPUBFUN int xmlCopyCharMultiByte (xmlChar *out, XMLPUBFUN int xmlCopyCharMultiByte (xmlChar *out,
@ -581,6 +591,7 @@ XMLPUBFUN int xmlCopyCharMultiByte (xmlChar *out,
XMLPUBFUN int xmlCopyChar (int len, XMLPUBFUN int xmlCopyChar (int len,
xmlChar *out, xmlChar *out,
int val); int val);
XML_DEPRECATED
XMLPUBFUN void xmlNextChar (xmlParserCtxtPtr ctxt); XMLPUBFUN void xmlNextChar (xmlParserCtxtPtr ctxt);
XML_DEPRECATED XML_DEPRECATED
XMLPUBFUN void xmlParserInputShrink (xmlParserInputPtr in); XMLPUBFUN void xmlParserInputShrink (xmlParserInputPtr in);

15
parser.c
View File

@ -1376,6 +1376,8 @@ xmlCleanSpecialAttr(xmlParserCtxtPtr ctxt)
* xmlCheckLanguageID: * xmlCheckLanguageID:
* @lang: pointer to the string value * @lang: pointer to the string value
* *
* DEPRECATED: Internal function, do not use.
*
* Checks that the value conforms to the LanguageID production: * Checks that the value conforms to the LanguageID production:
* *
* NOTE: this is somewhat deprecated, those productions were removed from * NOTE: this is somewhat deprecated, those productions were removed from
@ -1750,6 +1752,8 @@ inputPop(xmlParserCtxtPtr ctxt)
* @ctxt: an XML parser context * @ctxt: an XML parser context
* @value: the element node * @value: the element node
* *
* DEPRECATED: Internal function, do not use.
*
* Pushes a new element node on top of the node stack * Pushes a new element node on top of the node stack
* *
* Returns -1 in case of error, the index in the stack otherwise * Returns -1 in case of error, the index in the stack otherwise
@ -1788,6 +1792,8 @@ nodePush(xmlParserCtxtPtr ctxt, xmlNodePtr value)
* nodePop: * nodePop:
* @ctxt: an XML parser context * @ctxt: an XML parser context
* *
* DEPRECATED: Internal function, do not use.
*
* Pops the top element node from the node stack * Pops the top element node from the node stack
* *
* Returns the node just removed * Returns the node just removed
@ -1899,6 +1905,8 @@ nameNsPop(xmlParserCtxtPtr ctxt)
* @ctxt: an XML parser context * @ctxt: an XML parser context
* @value: the element name * @value: the element name
* *
* DEPRECATED: Internal function, do not use.
*
* Pushes a new element name on top of the name stack * Pushes a new element name on top of the name stack
* *
* Returns -1 in case of error, the index in the stack otherwise * Returns -1 in case of error, the index in the stack otherwise
@ -1926,10 +1934,13 @@ mem_error:
xmlErrMemory(ctxt, NULL); xmlErrMemory(ctxt, NULL);
return (-1); return (-1);
} }
/** /**
* namePop: * namePop:
* @ctxt: an XML parser context * @ctxt: an XML parser context
* *
* DEPRECATED: Internal function, do not use.
*
* Pops the top element name from the name stack * Pops the top element name from the name stack
* *
* Returns the name just removed * Returns the name just removed
@ -2098,6 +2109,8 @@ static int spacePop(xmlParserCtxtPtr ctxt) {
* xmlSkipBlankChars: * xmlSkipBlankChars:
* @ctxt: the XML parser context * @ctxt: the XML parser context
* *
* DEPRECATED: Internal function, do not use.
*
* skip all blanks character found at that point in the input streams. * skip all blanks character found at that point in the input streams.
* It pops up finished entities in the process if allowable at that point. * It pops up finished entities in the process if allowable at that point.
* *
@ -2473,6 +2486,8 @@ xmlParseStringCharRef(xmlParserCtxtPtr ctxt, const xmlChar **str) {
* xmlParserHandlePEReference: * xmlParserHandlePEReference:
* @ctxt: the parser context * @ctxt: the parser context
* *
* DEPRECATED: Internal function, do not use.
*
* [69] PEReference ::= '%' Name ';' * [69] PEReference ::= '%' Name ';'
* *
* [ WFC: No Recursion ] * [ WFC: No Recursion ]

8
parserInternals.c
View File

@ -513,6 +513,8 @@ xmlParserInputShrink(xmlParserInputPtr in) {
* xmlNextChar: * xmlNextChar:
* @ctxt: the XML parser context * @ctxt: the XML parser context
* *
* DEPRECATED: Internal function, do not use.
*
* Skip to the next char input char. * Skip to the next char input char.
*/ */
@ -658,6 +660,8 @@ encoding_error:
* @ctxt: the XML parser context * @ctxt: the XML parser context
* @len: pointer to the length of the char read * @len: pointer to the length of the char read
* *
* DEPRECATED: Internal function, do not use.
*
* The current char value, if using UTF-8 this may actually span multiple * The current char value, if using UTF-8 this may actually span multiple
* bytes in the input buffer. Implement the end of line normalization: * bytes in the input buffer. Implement the end of line normalization:
* 2.11 End-of-Line Handling * 2.11 End-of-Line Handling
@ -818,6 +822,8 @@ encoding_error:
* @cur: pointer to the beginning of the char * @cur: pointer to the beginning of the char
* @len: pointer to the length of the char read * @len: pointer to the length of the char read
* *
* DEPRECATED: Internal function, do not use.
*
* The current char value, if using UTF-8 this may actually span multiple * The current char value, if using UTF-8 this may actually span multiple
* bytes in the input buffer. * bytes in the input buffer.
* *
@ -1394,6 +1400,8 @@ xmlNewIOInputStream(xmlParserCtxtPtr ctxt, xmlParserInputBufferPtr input,
* @ctxt: an XML parser context * @ctxt: an XML parser context
* @entity: an Entity pointer * @entity: an Entity pointer
* *
* DEPRECATED: Internal function, do not use.
*
* Create a new input stream based on an xmlEntityPtr * Create a new input stream based on an xmlEntityPtr
* *
* Returns the new input stream or NULL * Returns the new input stream or NULL

8
python/generator.py
View File

@ -293,6 +293,11 @@ deprecated_funcs = {
'htmlInitAutoClose': True, 'htmlInitAutoClose': True,
'htmlParseCharRef': True, 'htmlParseCharRef': True,
'htmlParseElement': True, 'htmlParseElement': True,
'namePop': True,
'namePush': True,
'nodePop': True,
'nodePush': True,
'xmlCheckLanguageID': True,
'xmlCleanupCharEncodingHandlers': True, 'xmlCleanupCharEncodingHandlers': True,
'xmlCleanupGlobals': True, 'xmlCleanupGlobals': True,
'xmlDefaultSAXHandlerInit': True, 'xmlDefaultSAXHandlerInit': True,
@ -312,6 +317,7 @@ deprecated_funcs = {
'xmlNanoFTPProxy': True, 'xmlNanoFTPProxy': True,
'xmlNanoFTPScanProxy': True, 'xmlNanoFTPScanProxy': True,
'xmlNewGlobalNs': True, 'xmlNewGlobalNs': True,
'xmlNextChar': True,
'xmlParseAttValue': True, 'xmlParseAttValue': True,
'xmlParseAttributeListDecl': True, 'xmlParseAttributeListDecl': True,
'xmlParseCDSect': True, 'xmlParseCDSect': True,
@ -346,6 +352,7 @@ deprecated_funcs = {
'xmlParseVersionInfo': True, 'xmlParseVersionInfo': True,
'xmlParseVersionNum': True, 'xmlParseVersionNum': True,
'xmlParseXMLDecl': True, 'xmlParseXMLDecl': True,
'xmlParserHandlePEReference': True,
'xmlParserHandleReference': True, 'xmlParserHandleReference': True,
'xmlRecoverDoc': True, 'xmlRecoverDoc': True,
'xmlRecoverFile': True, 'xmlRecoverFile': True,
@ -358,6 +365,7 @@ deprecated_funcs = {
'xmlSchemaCleanupTypes': True, 'xmlSchemaCleanupTypes': True,
'xmlSchemaInitTypes': True, 'xmlSchemaInitTypes': True,
'xmlSetupParserForBuffer': True, 'xmlSetupParserForBuffer': True,
'xmlSkipBlankChars': True,
'xmlStringDecodeEntities': True, 'xmlStringDecodeEntities': True,
'xmlStringLenDecodeEntities': True, 'xmlStringLenDecodeEntities': True,
'xmlThrDefDefaultBufferSize': True, 'xmlThrDefDefaultBufferSize': True,

2
testchar.c
View File

@ -5,6 +5,8 @@
* copy: see Copyright for the status of this software. * copy: see Copyright for the status of this software.
*/ */
#define XML_DEPRECATED
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <libxml/tree.h> #include <libxml/tree.h>