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

valid: Deprecate internal validation functions

This commit is contained in:
Nick Wellnhofer
2024-03-16 14:50:56 +01:00
parent c0edd792ba
commit dc2a03d482
3 changed files with 65 additions and 0 deletions

View File

@ -309,31 +309,38 @@ XMLPUBFUN xmlValidCtxtPtr
XMLPUBFUN void XMLPUBFUN void
xmlFreeValidCtxt(xmlValidCtxtPtr); xmlFreeValidCtxt(xmlValidCtxtPtr);
XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlValidateRoot (xmlValidCtxtPtr ctxt, xmlValidateRoot (xmlValidCtxtPtr ctxt,
xmlDocPtr doc); xmlDocPtr doc);
XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlValidateElementDecl (xmlValidCtxtPtr ctxt, xmlValidateElementDecl (xmlValidCtxtPtr ctxt,
xmlDocPtr doc, xmlDocPtr doc,
xmlElementPtr elem); xmlElementPtr elem);
XML_DEPRECATED
XMLPUBFUN xmlChar * XMLPUBFUN xmlChar *
xmlValidNormalizeAttributeValue(xmlDocPtr doc, xmlValidNormalizeAttributeValue(xmlDocPtr doc,
xmlNodePtr elem, xmlNodePtr elem,
const xmlChar *name, const xmlChar *name,
const xmlChar *value); const xmlChar *value);
XML_DEPRECATED
XMLPUBFUN xmlChar * XMLPUBFUN xmlChar *
xmlValidCtxtNormalizeAttributeValue(xmlValidCtxtPtr ctxt, xmlValidCtxtNormalizeAttributeValue(xmlValidCtxtPtr ctxt,
xmlDocPtr doc, xmlDocPtr doc,
xmlNodePtr elem, xmlNodePtr elem,
const xmlChar *name, const xmlChar *name,
const xmlChar *value); const xmlChar *value);
XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlValidateAttributeDecl(xmlValidCtxtPtr ctxt, xmlValidateAttributeDecl(xmlValidCtxtPtr ctxt,
xmlDocPtr doc, xmlDocPtr doc,
xmlAttributePtr attr); xmlAttributePtr attr);
XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlValidateAttributeValue(xmlAttributeType type, xmlValidateAttributeValue(xmlAttributeType type,
const xmlChar *value); const xmlChar *value);
XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlValidateNotationDecl (xmlValidCtxtPtr ctxt, xmlValidateNotationDecl (xmlValidCtxtPtr ctxt,
xmlDocPtr doc, xmlDocPtr doc,
@ -342,6 +349,7 @@ XMLPUBFUN int
xmlValidateDtd (xmlValidCtxtPtr ctxt, xmlValidateDtd (xmlValidCtxtPtr ctxt,
xmlDocPtr doc, xmlDocPtr doc,
xmlDtdPtr dtd); xmlDtdPtr dtd);
XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlValidateDtdFinal (xmlValidCtxtPtr ctxt, xmlValidateDtdFinal (xmlValidCtxtPtr ctxt,
xmlDocPtr doc); xmlDocPtr doc);
@ -352,16 +360,19 @@ XMLPUBFUN int
xmlValidateElement (xmlValidCtxtPtr ctxt, xmlValidateElement (xmlValidCtxtPtr ctxt,
xmlDocPtr doc, xmlDocPtr doc,
xmlNodePtr elem); xmlNodePtr elem);
XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlValidateOneElement (xmlValidCtxtPtr ctxt, xmlValidateOneElement (xmlValidCtxtPtr ctxt,
xmlDocPtr doc, xmlDocPtr doc,
xmlNodePtr elem); xmlNodePtr elem);
XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlValidateOneAttribute (xmlValidCtxtPtr ctxt, xmlValidateOneAttribute (xmlValidCtxtPtr ctxt,
xmlDocPtr doc, xmlDocPtr doc,
xmlNodePtr elem, xmlNodePtr elem,
xmlAttrPtr attr, xmlAttrPtr attr,
const xmlChar *value); const xmlChar *value);
XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlValidateOneNamespace (xmlValidCtxtPtr ctxt, xmlValidateOneNamespace (xmlValidCtxtPtr ctxt,
xmlDocPtr doc, xmlDocPtr doc,
@ -369,12 +380,14 @@ XMLPUBFUN int
const xmlChar *prefix, const xmlChar *prefix,
xmlNsPtr ns, xmlNsPtr ns,
const xmlChar *value); const xmlChar *value);
XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlValidateDocumentFinal(xmlValidCtxtPtr ctxt, xmlValidateDocumentFinal(xmlValidCtxtPtr ctxt,
xmlDocPtr doc); xmlDocPtr doc);
#endif /* LIBXML_VALID_ENABLED */ #endif /* LIBXML_VALID_ENABLED */
#if defined(LIBXML_VALID_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) #if defined(LIBXML_VALID_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlValidateNotationUse (xmlValidCtxtPtr ctxt, xmlValidateNotationUse (xmlValidCtxtPtr ctxt,
xmlDocPtr doc, xmlDocPtr doc,
@ -430,19 +443,23 @@ XMLPUBFUN int
/* /*
* Validation based on the regexp support * Validation based on the regexp support
*/ */
XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlValidBuildContentModel(xmlValidCtxtPtr ctxt, xmlValidBuildContentModel(xmlValidCtxtPtr ctxt,
xmlElementPtr elem); xmlElementPtr elem);
XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlValidatePushElement (xmlValidCtxtPtr ctxt, xmlValidatePushElement (xmlValidCtxtPtr ctxt,
xmlDocPtr doc, xmlDocPtr doc,
xmlNodePtr elem, xmlNodePtr elem,
const xmlChar *qname); const xmlChar *qname);
XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlValidatePushCData (xmlValidCtxtPtr ctxt, xmlValidatePushCData (xmlValidCtxtPtr ctxt,
const xmlChar *data, const xmlChar *data,
int len); int len);
XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlValidatePopElement (xmlValidCtxtPtr ctxt, xmlValidatePopElement (xmlValidCtxtPtr ctxt,
xmlDocPtr doc, xmlDocPtr doc,

View File

@ -391,6 +391,20 @@ deprecated_funcs = {
'xmlThrDefParserDebugEntities': True, 'xmlThrDefParserDebugEntities': True,
'xmlThrDefPedanticParserDefaultValue': True, 'xmlThrDefPedanticParserDefaultValue': True,
'xmlThrDefSubstituteEntitiesDefaultValue': True, 'xmlThrDefSubstituteEntitiesDefaultValue': True,
'xmlValidCtxtNormalizeAttributeValue': True,
'xmlValidNormalizeAttributeValue': True,
'xmlValidateAttributeValue': True,
'xmlValidateDocumentFinal': True,
'xmlValidateDtdFinal': True,
'xmlValidateNotationUse': True,
'xmlValidateOneAttribute': True,
'xmlValidateOneElement': True,
'xmlValidateOneNamespace': True,
'xmlValidatePopElement': True,
'xmlValidatePushCData': True,
'xmlValidatePushElement': True,
'xmlValidateRoot': True,
'xmlValidate': True,
'xmlXPathInit': True, 'xmlXPathInit': True,
'xmlXPtrEvalRangePredicate': True, 'xmlXPtrEvalRangePredicate': True,
'xmlXPtrNewCollapsedRange': True, 'xmlXPtrNewCollapsedRange': True,

34
valid.c
View File

@ -592,6 +592,8 @@ xmlValidBuildAContentModel(xmlElementContentPtr content,
* @ctxt: a validation context * @ctxt: a validation context
* @elem: an element declaration node * @elem: an element declaration node
* *
* DEPRECATED: Internal function, don't use.
*
* (Re)Build the automata associated to the content model of this * (Re)Build the automata associated to the content model of this
* element * element
* *
@ -3155,6 +3157,8 @@ xmlGetDtdNotationDesc(xmlDtdPtr dtd, const xmlChar *name) {
* @doc: the document * @doc: the document
* @notationName: the notation name to check * @notationName: the notation name to check
* *
* DEPRECATED: Internal function, don't use.
*
* Validate that the given name match a notation declaration. * Validate that the given name match a notation declaration.
* - [ VC: Notation Declared ] * - [ VC: Notation Declared ]
* *
@ -3570,6 +3574,8 @@ xmlValidateNmtokensValue(const xmlChar *value) {
* @doc: a document instance * @doc: a document instance
* @nota: a notation definition * @nota: a notation definition
* *
* DEPRECATED: Internal function, don't use.
*
* Try to validate a single notation definition * Try to validate a single notation definition
* basically it does the following checks as described by the * basically it does the following checks as described by the
* XML-1.0 recommendation: * XML-1.0 recommendation:
@ -3626,6 +3632,8 @@ xmlValidateAttributeValueInternal(xmlDocPtr doc, xmlAttributeType type,
* @type: an attribute type * @type: an attribute type
* @value: an attribute value * @value: an attribute value
* *
* DEPRECATED: Internal function, don't use.
*
* Validate that the given attribute value match the proper production * Validate that the given attribute value match the proper production
* *
* [ VC: ID ] * [ VC: ID ]
@ -3782,6 +3790,8 @@ xmlValidateAttributeValue2(xmlValidCtxtPtr ctxt, xmlDocPtr doc,
* @value: the attribute value * @value: the attribute value
* @ctxt: the validation context or NULL * @ctxt: the validation context or NULL
* *
* DEPRECATED: Internal function, don't use.
*
* Does the validation related extra step of the normalization of attribute * Does the validation related extra step of the normalization of attribute
* values: * values:
* *
@ -3878,6 +3888,8 @@ done:
* @name: the attribute name * @name: the attribute name
* @value: the attribute value * @value: the attribute value
* *
* DEPRECATED: Internal function, don't use.
*
* Does the validation related extra step of the normalization of attribute * Does the validation related extra step of the normalization of attribute
* values: * values:
* *
@ -3941,6 +3953,8 @@ xmlValidateAttributeIdCallback(void *payload, void *data,
* @doc: a document instance * @doc: a document instance
* @attr: an attribute definition * @attr: an attribute definition
* *
* DEPRECATED: Internal function, don't use.
*
* Try to validate a single attribute definition * Try to validate a single attribute definition
* basically it does the following checks as described by the * basically it does the following checks as described by the
* XML-1.0 recommendation: * XML-1.0 recommendation:
@ -4070,6 +4084,8 @@ xmlValidateAttributeDecl(xmlValidCtxtPtr ctxt, xmlDocPtr doc,
* @doc: a document instance * @doc: a document instance
* @elem: an element definition * @elem: an element definition
* *
* DEPRECATED: Internal function, don't use.
*
* Try to validate a single element definition * Try to validate a single element definition
* basically it does the following checks as described by the * basically it does the following checks as described by the
* XML-1.0 recommendation: * XML-1.0 recommendation:
@ -4202,6 +4218,8 @@ xmlValidateElementDecl(xmlValidCtxtPtr ctxt, xmlDocPtr doc,
* @attr: an attribute instance * @attr: an attribute instance
* @value: the attribute value (without entities processing) * @value: the attribute value (without entities processing)
* *
* DEPRECATED: Internal function, don't use.
*
* Try to validate a single attribute for an element * Try to validate a single attribute for an element
* basically it does the following checks as described by the * basically it does the following checks as described by the
* XML-1.0 recommendation: * XML-1.0 recommendation:
@ -4371,6 +4389,8 @@ xmlValidateOneAttribute(xmlValidCtxtPtr ctxt, xmlDocPtr doc,
* @ns: an namespace declaration instance * @ns: an namespace declaration instance
* @value: the attribute value (without entities processing) * @value: the attribute value (without entities processing)
* *
* DEPRECATED: Internal function, don't use.
*
* Try to validate a single namespace declaration for an element * Try to validate a single namespace declaration for an element
* basically it does the following checks as described by the * basically it does the following checks as described by the
* XML-1.0 recommendation: * XML-1.0 recommendation:
@ -5544,6 +5564,8 @@ xmlValidGetElemDecl(xmlValidCtxtPtr ctxt, xmlDocPtr doc,
* @elem: an element instance * @elem: an element instance
* @qname: the qualified name as appearing in the serialization * @qname: the qualified name as appearing in the serialization
* *
* DEPRECATED: Internal function, don't use.
*
* Push a new element start on the validation stack. * Push a new element start on the validation stack.
* *
* returns 1 if no validation problem was found or 0 otherwise * returns 1 if no validation problem was found or 0 otherwise
@ -5641,6 +5663,8 @@ xmlValidatePushElement(xmlValidCtxtPtr ctxt, xmlDocPtr doc,
* @data: some character data read * @data: some character data read
* @len: the length of the data * @len: the length of the data
* *
* DEPRECATED: Internal function, don't use.
*
* check the CData parsed for validation in the current stack * check the CData parsed for validation in the current stack
* *
* returns 1 if no validation problem was found or 0 otherwise * returns 1 if no validation problem was found or 0 otherwise
@ -5714,6 +5738,8 @@ done:
* @elem: an element instance * @elem: an element instance
* @qname: the qualified name as appearing in the serialization * @qname: the qualified name as appearing in the serialization
* *
* DEPRECATED: Internal function, don't use.
*
* Pop the element end from the validation stack. * Pop the element end from the validation stack.
* *
* returns 1 if no validation problem was found or 0 otherwise * returns 1 if no validation problem was found or 0 otherwise
@ -5768,6 +5794,8 @@ xmlValidatePopElement(xmlValidCtxtPtr ctxt, xmlDocPtr doc ATTRIBUTE_UNUSED,
* @doc: a document instance * @doc: a document instance
* @elem: an element instance * @elem: an element instance
* *
* DEPRECATED: Internal function, don't use.
*
* Try to validate a single element and it's attributes, * Try to validate a single element and it's attributes,
* basically it does the following checks as described by the * basically it does the following checks as described by the
* XML-1.0 recommendation: * XML-1.0 recommendation:
@ -6094,6 +6122,8 @@ found:
* @ctxt: the validation context * @ctxt: the validation context
* @doc: a document instance * @doc: a document instance
* *
* DEPRECATED: Internal function, don't use.
*
* Try to validate a the root element * Try to validate a the root element
* basically it does the following check as described by the * basically it does the following check as described by the
* XML-1.0 recommendation: * XML-1.0 recommendation:
@ -6355,6 +6385,8 @@ xmlValidateCheckRefCallback(void *payload, void *data, const xmlChar *name) {
* @ctxt: the validation context * @ctxt: the validation context
* @doc: a document instance * @doc: a document instance
* *
* DEPRECATED: Internal function, don't use.
*
* Does the final step for the document validation once all the * Does the final step for the document validation once all the
* incremental validation steps have been completed * incremental validation steps have been completed
* *
@ -6583,6 +6615,8 @@ xmlValidateAttributeCallback(void *payload, void *data,
* @ctxt: the validation context * @ctxt: the validation context
* @doc: a document instance * @doc: a document instance
* *
* DEPRECATED: Internal function, don't use.
*
* Does the final step for the dtds validation once all the * Does the final step for the dtds validation once all the
* subsets have been parsed * subsets have been parsed
* *