@img/sharp-libvips-dev 1.2.2 → 1.2.4-rc.0

package/include/libxml2/libxml/valid.h

@@ -1,17 +1,20 @@
-/*
- * Summary: The DTD validation
- * Description: API for the DTD handling and the validity checking
+/**
+ * @file
+ * 
+ * @brief DTD validator
+ * 
+ * API to handle XML Document Type Definitions and validate
+ * documents.
  *
- * Copy: See Copyright for the status of this software.
+ * @copyright See Copyright for the status of this software.
  *
- * Author: Daniel Veillard
+ * @author Daniel Veillard
  */
 
 
 #ifndef __XML_VALID_H__
 #define __XML_VALID_H__
 
-/** DOC_DISABLE */
 #include <libxml/xmlversion.h>
 #include <libxml/xmlerror.h>
 #define XML_TREE_INTERNALS
@@ -20,67 +23,57 @@
 #include <libxml/list.h>
 #include <libxml/xmlautomata.h>
 #include <libxml/xmlregexp.h>
-/** DOC_ENABLE */
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /*
- * Validation state added for non-determinist content model.
+ * Validation state added for non-deterministic content model.
  */
 typedef struct _xmlValidState xmlValidState;
 typedef xmlValidState *xmlValidStatePtr;
 
 /**
- * xmlValidityErrorFunc:
- * @ctx:  usually an xmlValidCtxtPtr to a validity error context,
- *        but comes from ctxt->userData (which normally contains such
- *        a pointer); ctxt->userData can be changed by the user.
- * @msg:  the string to format *printf like vararg
- * @...:  remaining arguments to the format
+ * Report a validity error.
  *
- * Callback called when a validity error is found. This is a message
- * oriented function similar to an *printf function.
+ * @param ctx  user data (usually an xmlValidCtxt)
+ * @param msg  printf-like format string
+ * @param ...  arguments to format
  */
 typedef void (*xmlValidityErrorFunc) (void *ctx,
 			     const char *msg,
 			     ...) LIBXML_ATTR_FORMAT(2,3);
 
 /**
- * xmlValidityWarningFunc:
- * @ctx:  usually an xmlValidCtxtPtr to a validity error context,
- *        but comes from ctxt->userData (which normally contains such
- *        a pointer); ctxt->userData can be changed by the user.
- * @msg:  the string to format *printf like vararg
- * @...:  remaining arguments to the format
+ * Report a validity warning.
  *
- * Callback called when a validity warning is found. This is a message
- * oriented function similar to an *printf function.
+ * @param ctx  user data (usually an xmlValidCtxt)
+ * @param msg  printf-like format string
+ * @param ...  arguments to format
  */
 typedef void (*xmlValidityWarningFunc) (void *ctx,
 			       const char *msg,
 			       ...) LIBXML_ATTR_FORMAT(2,3);
 
-/*
- * xmlValidCtxt:
- * An xmlValidCtxt is used for error reporting when validating.
- */
 typedef struct _xmlValidCtxt xmlValidCtxt;
 typedef xmlValidCtxt *xmlValidCtxtPtr;
+/**
+ * An xmlValidCtxt is used for error reporting when validating.
+ */
 struct _xmlValidCtxt {
     void *userData;			/* user specific data block */
     xmlValidityErrorFunc error;		/* the callback in case of errors */
     xmlValidityWarningFunc warning;	/* the callback in case of warning */
 
     /* Node analysis stack used when validating within entities */
-    xmlNodePtr         node;          /* Current parsed Node */
+    xmlNode           *node;          /* Current parsed Node */
     int                nodeNr;        /* Depth of the parsing stack */
     int                nodeMax;       /* Max depth of the parsing stack */
-    xmlNodePtr        *nodeTab;       /* array of nodes */
+    xmlNode          **nodeTab;       /* array of nodes */
 
     unsigned int         flags;       /* internal flags */
-    xmlDocPtr              doc;       /* the document */
+    xmlDoc                *doc;       /* the document */
     int                  valid;       /* temporary validity check result */
 
     /* state state used for non-determinist content validation */
@@ -90,225 +83,198 @@ struct _xmlValidCtxt {
     xmlValidState     *vstateTab;     /* array of validation states */
 
 #ifdef LIBXML_REGEXP_ENABLED
-    xmlAutomataPtr            am;     /* the automata */
-    xmlAutomataStatePtr    state;     /* used to build the automata */
+    xmlAutomata              *am;     /* the automata */
+    xmlAutomataState      *state;     /* used to build the automata */
 #else
     void                     *am;
     void                  *state;
 #endif
 };
 
-/*
- * ALL notation declarations are stored in a table.
- * There is one table per DTD.
- */
-
 typedef struct _xmlHashTable xmlNotationTable;
 typedef xmlNotationTable *xmlNotationTablePtr;
 
-/*
- * ALL element declarations are stored in a table.
- * There is one table per DTD.
- */
-
 typedef struct _xmlHashTable xmlElementTable;
 typedef xmlElementTable *xmlElementTablePtr;
 
-/*
- * ALL attribute declarations are stored in a table.
- * There is one table per DTD.
- */
-
 typedef struct _xmlHashTable xmlAttributeTable;
 typedef xmlAttributeTable *xmlAttributeTablePtr;
 
-/*
- * ALL IDs attributes are stored in a table.
- * There is one table per document.
- */
-
 typedef struct _xmlHashTable xmlIDTable;
 typedef xmlIDTable *xmlIDTablePtr;
 
-/*
- * ALL Refs attributes are stored in a table.
- * There is one table per document.
- */
-
 typedef struct _xmlHashTable xmlRefTable;
 typedef xmlRefTable *xmlRefTablePtr;
 
 /* Notation */
-XMLPUBFUN xmlNotationPtr
-		xmlAddNotationDecl	(xmlValidCtxtPtr ctxt,
-					 xmlDtdPtr dtd,
+XMLPUBFUN xmlNotation *
+		xmlAddNotationDecl	(xmlValidCtxt *ctxt,
+					 xmlDtd *dtd,
 					 const xmlChar *name,
-					 const xmlChar *PublicID,
-					 const xmlChar *SystemID);
+					 const xmlChar *publicId,
+					 const xmlChar *systemId);
 XML_DEPRECATED
-XMLPUBFUN xmlNotationTablePtr
-		xmlCopyNotationTable	(xmlNotationTablePtr table);
+XMLPUBFUN xmlNotationTable *
+		xmlCopyNotationTable	(xmlNotationTable *table);
 XML_DEPRECATED
 XMLPUBFUN void
-		xmlFreeNotationTable	(xmlNotationTablePtr table);
+		xmlFreeNotationTable	(xmlNotationTable *table);
 #ifdef LIBXML_OUTPUT_ENABLED
 XML_DEPRECATED
 XMLPUBFUN void
-		xmlDumpNotationDecl	(xmlBufferPtr buf,
-					 xmlNotationPtr nota);
+		xmlDumpNotationDecl	(xmlBuffer *buf,
+					 xmlNotation *nota);
 /* XML_DEPRECATED, still used in lxml */
 XMLPUBFUN void
-		xmlDumpNotationTable	(xmlBufferPtr buf,
-					 xmlNotationTablePtr table);
+		xmlDumpNotationTable	(xmlBuffer *buf,
+					 xmlNotationTable *table);
 #endif /* LIBXML_OUTPUT_ENABLED */
 
 /* Element Content */
-/* the non Doc version are being deprecated */
 XML_DEPRECATED
-XMLPUBFUN xmlElementContentPtr
+XMLPUBFUN xmlElementContent *
 		xmlNewElementContent	(const xmlChar *name,
 					 xmlElementContentType type);
 XML_DEPRECATED
-XMLPUBFUN xmlElementContentPtr
-		xmlCopyElementContent	(xmlElementContentPtr content);
+XMLPUBFUN xmlElementContent *
+		xmlCopyElementContent	(xmlElementContent *content);
 XML_DEPRECATED
 XMLPUBFUN void
-		xmlFreeElementContent	(xmlElementContentPtr cur);
-/* the new versions with doc argument */
+		xmlFreeElementContent	(xmlElementContent *cur);
 XML_DEPRECATED
-XMLPUBFUN xmlElementContentPtr
-		xmlNewDocElementContent	(xmlDocPtr doc,
+XMLPUBFUN xmlElementContent *
+		xmlNewDocElementContent	(xmlDoc *doc,
 					 const xmlChar *name,
 					 xmlElementContentType type);
 XML_DEPRECATED
-XMLPUBFUN xmlElementContentPtr
-		xmlCopyDocElementContent(xmlDocPtr doc,
-					 xmlElementContentPtr content);
+XMLPUBFUN xmlElementContent *
+		xmlCopyDocElementContent(xmlDoc *doc,
+					 xmlElementContent *content);
 XML_DEPRECATED
 XMLPUBFUN void
-		xmlFreeDocElementContent(xmlDocPtr doc,
-					 xmlElementContentPtr cur);
+		xmlFreeDocElementContent(xmlDoc *doc,
+					 xmlElementContent *cur);
 XML_DEPRECATED
 XMLPUBFUN void
 		xmlSnprintfElementContent(char *buf,
 					 int size,
-	                                 xmlElementContentPtr content,
+	                                 xmlElementContent *content,
 					 int englob);
 #ifdef LIBXML_OUTPUT_ENABLED
 XML_DEPRECATED
 XMLPUBFUN void
 		xmlSprintfElementContent(char *buf,
-	                                 xmlElementContentPtr content,
+	                                 xmlElementContent *content,
 					 int englob);
 #endif /* LIBXML_OUTPUT_ENABLED */
 
 /* Element */
-XMLPUBFUN xmlElementPtr
-		xmlAddElementDecl	(xmlValidCtxtPtr ctxt,
-					 xmlDtdPtr dtd,
+XMLPUBFUN xmlElement *
+		xmlAddElementDecl	(xmlValidCtxt *ctxt,
+					 xmlDtd *dtd,
 					 const xmlChar *name,
 					 xmlElementTypeVal type,
-					 xmlElementContentPtr content);
+					 xmlElementContent *content);
 XML_DEPRECATED
-XMLPUBFUN xmlElementTablePtr
-		xmlCopyElementTable	(xmlElementTablePtr table);
+XMLPUBFUN xmlElementTable *
+		xmlCopyElementTable	(xmlElementTable *table);
 XML_DEPRECATED
 XMLPUBFUN void
-		xmlFreeElementTable	(xmlElementTablePtr table);
+		xmlFreeElementTable	(xmlElementTable *table);
 #ifdef LIBXML_OUTPUT_ENABLED
 XML_DEPRECATED
 XMLPUBFUN void
-		xmlDumpElementTable	(xmlBufferPtr buf,
-					 xmlElementTablePtr table);
+		xmlDumpElementTable	(xmlBuffer *buf,
+					 xmlElementTable *table);
 XML_DEPRECATED
 XMLPUBFUN void
-		xmlDumpElementDecl	(xmlBufferPtr buf,
-					 xmlElementPtr elem);
+		xmlDumpElementDecl	(xmlBuffer *buf,
+					 xmlElement *elem);
 #endif /* LIBXML_OUTPUT_ENABLED */
 
 /* Enumeration */
 XML_DEPRECATED
-XMLPUBFUN xmlEnumerationPtr
+XMLPUBFUN xmlEnumeration *
 		xmlCreateEnumeration	(const xmlChar *name);
 /* XML_DEPRECATED, needed for custom attributeDecl SAX handler */
 XMLPUBFUN void
-		xmlFreeEnumeration	(xmlEnumerationPtr cur);
+		xmlFreeEnumeration	(xmlEnumeration *cur);
 XML_DEPRECATED
-XMLPUBFUN xmlEnumerationPtr
-		xmlCopyEnumeration	(xmlEnumerationPtr cur);
+XMLPUBFUN xmlEnumeration *
+		xmlCopyEnumeration	(xmlEnumeration *cur);
 
 /* Attribute */
-XMLPUBFUN xmlAttributePtr
-		xmlAddAttributeDecl	(xmlValidCtxtPtr ctxt,
-					 xmlDtdPtr dtd,
+XMLPUBFUN xmlAttribute *
+		xmlAddAttributeDecl	(xmlValidCtxt *ctxt,
+					 xmlDtd *dtd,
 					 const xmlChar *elem,
 					 const xmlChar *name,
 					 const xmlChar *ns,
 					 xmlAttributeType type,
 					 xmlAttributeDefault def,
 					 const xmlChar *defaultValue,
-					 xmlEnumerationPtr tree);
+					 xmlEnumeration *tree);
 XML_DEPRECATED
-XMLPUBFUN xmlAttributeTablePtr
-		xmlCopyAttributeTable  (xmlAttributeTablePtr table);
+XMLPUBFUN xmlAttributeTable *
+		xmlCopyAttributeTable  (xmlAttributeTable *table);
 XML_DEPRECATED
 XMLPUBFUN void
-		xmlFreeAttributeTable  (xmlAttributeTablePtr table);
+		xmlFreeAttributeTable  (xmlAttributeTable *table);
 #ifdef LIBXML_OUTPUT_ENABLED
 XML_DEPRECATED
 XMLPUBFUN void
-		xmlDumpAttributeTable  (xmlBufferPtr buf,
-					xmlAttributeTablePtr table);
+		xmlDumpAttributeTable  (xmlBuffer *buf,
+					xmlAttributeTable *table);
 XML_DEPRECATED
 XMLPUBFUN void
-		xmlDumpAttributeDecl   (xmlBufferPtr buf,
-					xmlAttributePtr attr);
+		xmlDumpAttributeDecl   (xmlBuffer *buf,
+					xmlAttribute *attr);
 #endif /* LIBXML_OUTPUT_ENABLED */
 
 /* IDs */
 XMLPUBFUN int
-		xmlAddIDSafe	       (xmlAttrPtr attr,
+		xmlAddIDSafe	       (xmlAttr *attr,
 					const xmlChar *value);
-XMLPUBFUN xmlIDPtr
-		xmlAddID	       (xmlValidCtxtPtr ctxt,
-					xmlDocPtr doc,
+XMLPUBFUN xmlID *
+		xmlAddID	       (xmlValidCtxt *ctxt,
+					xmlDoc *doc,
 					const xmlChar *value,
-					xmlAttrPtr attr);
+					xmlAttr *attr);
 XMLPUBFUN void
-		xmlFreeIDTable	       (xmlIDTablePtr table);
-XMLPUBFUN xmlAttrPtr
-		xmlGetID	       (xmlDocPtr doc,
+		xmlFreeIDTable	       (xmlIDTable *table);
+XMLPUBFUN xmlAttr *
+		xmlGetID	       (xmlDoc *doc,
 					const xmlChar *ID);
 XMLPUBFUN int
-		xmlIsID		       (xmlDocPtr doc,
-					xmlNodePtr elem,
-					xmlAttrPtr attr);
+		xmlIsID		       (xmlDoc *doc,
+					xmlNode *elem,
+					xmlAttr *attr);
 XMLPUBFUN int
-		xmlRemoveID	       (xmlDocPtr doc,
-					xmlAttrPtr attr);
+		xmlRemoveID	       (xmlDoc *doc,
+					xmlAttr *attr);
 
 /* IDREFs */
 XML_DEPRECATED
-XMLPUBFUN xmlRefPtr
-		xmlAddRef	       (xmlValidCtxtPtr ctxt,
-					xmlDocPtr doc,
+XMLPUBFUN xmlRef *
+		xmlAddRef	       (xmlValidCtxt *ctxt,
+					xmlDoc *doc,
 					const xmlChar *value,
-					xmlAttrPtr attr);
+					xmlAttr *attr);
 XML_DEPRECATED
 XMLPUBFUN void
-		xmlFreeRefTable	       (xmlRefTablePtr table);
+		xmlFreeRefTable	       (xmlRefTable *table);
 XML_DEPRECATED
 XMLPUBFUN int
-		xmlIsRef	       (xmlDocPtr doc,
-					xmlNodePtr elem,
-					xmlAttrPtr attr);
+		xmlIsRef	       (xmlDoc *doc,
+					xmlNode *elem,
+					xmlAttr *attr);
 XML_DEPRECATED
 XMLPUBFUN int
-		xmlRemoveRef	       (xmlDocPtr doc,
-					xmlAttrPtr attr);
+		xmlRemoveRef	       (xmlDoc *doc,
+					xmlAttr *attr);
 XML_DEPRECATED
-XMLPUBFUN xmlListPtr
-		xmlGetRefs	       (xmlDocPtr doc,
+XMLPUBFUN xmlList *
+		xmlGetRefs	       (xmlDoc *doc,
 					const xmlChar *ID);
 
 /**
@@ -316,114 +282,115 @@ XMLPUBFUN xmlListPtr
  */
 #ifdef LIBXML_VALID_ENABLED
 /* Allocate/Release Validation Contexts */
-XMLPUBFUN xmlValidCtxtPtr
+XMLPUBFUN xmlValidCtxt *
 		xmlNewValidCtxt(void);
 XMLPUBFUN void
-		xmlFreeValidCtxt(xmlValidCtxtPtr);
+		xmlFreeValidCtxt(xmlValidCtxt *);
 
 XML_DEPRECATED
 XMLPUBFUN int
-		xmlValidateRoot		(xmlValidCtxtPtr ctxt,
-					 xmlDocPtr doc);
+		xmlValidateRoot		(xmlValidCtxt *ctxt,
+					 xmlDoc *doc);
 XML_DEPRECATED
 XMLPUBFUN int
-		xmlValidateElementDecl	(xmlValidCtxtPtr ctxt,
-					 xmlDocPtr doc,
-		                         xmlElementPtr elem);
+		xmlValidateElementDecl	(xmlValidCtxt *ctxt,
+					 xmlDoc *doc,
+		                         xmlElement *elem);
 XML_DEPRECATED
 XMLPUBFUN xmlChar *
-		xmlValidNormalizeAttributeValue(xmlDocPtr doc,
-					 xmlNodePtr elem,
+		xmlValidNormalizeAttributeValue(xmlDoc *doc,
+					 xmlNode *elem,
 					 const xmlChar *name,
 					 const xmlChar *value);
 XML_DEPRECATED
 XMLPUBFUN xmlChar *
-		xmlValidCtxtNormalizeAttributeValue(xmlValidCtxtPtr ctxt,
-					 xmlDocPtr doc,
-					 xmlNodePtr elem,
+		xmlValidCtxtNormalizeAttributeValue(xmlValidCtxt *ctxt,
+					 xmlDoc *doc,
+					 xmlNode *elem,
 					 const xmlChar *name,
 					 const xmlChar *value);
 XML_DEPRECATED
 XMLPUBFUN int
-		xmlValidateAttributeDecl(xmlValidCtxtPtr ctxt,
-					 xmlDocPtr doc,
-		                         xmlAttributePtr attr);
+		xmlValidateAttributeDecl(xmlValidCtxt *ctxt,
+					 xmlDoc *doc,
+		                         xmlAttribute *attr);
 XML_DEPRECATED
 XMLPUBFUN int
 		xmlValidateAttributeValue(xmlAttributeType type,
 					 const xmlChar *value);
 XML_DEPRECATED
 XMLPUBFUN int
-		xmlValidateNotationDecl	(xmlValidCtxtPtr ctxt,
-					 xmlDocPtr doc,
-		                         xmlNotationPtr nota);
+		xmlValidateNotationDecl	(xmlValidCtxt *ctxt,
+					 xmlDoc *doc,
+		                         xmlNotation *nota);
 XMLPUBFUN int
-		xmlValidateDtd		(xmlValidCtxtPtr ctxt,
-					 xmlDocPtr doc,
-					 xmlDtdPtr dtd);
+		xmlValidateDtd		(xmlValidCtxt *ctxt,
+					 xmlDoc *doc,
+					 xmlDtd *dtd);
 XML_DEPRECATED
 XMLPUBFUN int
-		xmlValidateDtdFinal	(xmlValidCtxtPtr ctxt,
-					 xmlDocPtr doc);
+		xmlValidateDtdFinal	(xmlValidCtxt *ctxt,
+					 xmlDoc *doc);
 XMLPUBFUN int
-		xmlValidateDocument	(xmlValidCtxtPtr ctxt,
-					 xmlDocPtr doc);
+		xmlValidateDocument	(xmlValidCtxt *ctxt,
+					 xmlDoc *doc);
 XMLPUBFUN int
-		xmlValidateElement	(xmlValidCtxtPtr ctxt,
-					 xmlDocPtr doc,
-					 xmlNodePtr elem);
+		xmlValidateElement	(xmlValidCtxt *ctxt,
+					 xmlDoc *doc,
+					 xmlNode *elem);
 XML_DEPRECATED
 XMLPUBFUN int
-		xmlValidateOneElement	(xmlValidCtxtPtr ctxt,
-					 xmlDocPtr doc,
-		                         xmlNodePtr elem);
+		xmlValidateOneElement	(xmlValidCtxt *ctxt,
+					 xmlDoc *doc,
+		                         xmlNode *elem);
 XML_DEPRECATED
 XMLPUBFUN int
-		xmlValidateOneAttribute	(xmlValidCtxtPtr ctxt,
-					 xmlDocPtr doc,
-					 xmlNodePtr	elem,
-					 xmlAttrPtr attr,
+		xmlValidateOneAttribute	(xmlValidCtxt *ctxt,
+					 xmlDoc *doc,
+					 xmlNode 	*elem,
+					 xmlAttr *attr,
 					 const xmlChar *value);
 XML_DEPRECATED
 XMLPUBFUN int
-		xmlValidateOneNamespace	(xmlValidCtxtPtr ctxt,
-					 xmlDocPtr doc,
-					 xmlNodePtr elem,
+		xmlValidateOneNamespace	(xmlValidCtxt *ctxt,
+					 xmlDoc *doc,
+					 xmlNode *elem,
 					 const xmlChar *prefix,
-					 xmlNsPtr ns,
+					 xmlNs *ns,
 					 const xmlChar *value);
 XML_DEPRECATED
 XMLPUBFUN int
-		xmlValidateDocumentFinal(xmlValidCtxtPtr ctxt,
-					 xmlDocPtr doc);
+		xmlValidateDocumentFinal(xmlValidCtxt *ctxt,
+					 xmlDoc *doc);
 XML_DEPRECATED
 XMLPUBFUN int
-		xmlValidateNotationUse	(xmlValidCtxtPtr ctxt,
-					 xmlDocPtr doc,
+		xmlValidateNotationUse	(xmlValidCtxt *ctxt,
+					 xmlDoc *doc,
 					 const xmlChar *notationName);
 #endif /* LIBXML_VALID_ENABLED */
 
+XML_DEPRECATED
 XMLPUBFUN int
-		xmlIsMixedElement	(xmlDocPtr doc,
+		xmlIsMixedElement	(xmlDoc *doc,
 					 const xmlChar *name);
-XMLPUBFUN xmlAttributePtr
-		xmlGetDtdAttrDesc	(xmlDtdPtr dtd,
+XMLPUBFUN xmlAttribute *
+		xmlGetDtdAttrDesc	(xmlDtd *dtd,
 					 const xmlChar *elem,
 					 const xmlChar *name);
-XMLPUBFUN xmlAttributePtr
-		xmlGetDtdQAttrDesc	(xmlDtdPtr dtd,
+XMLPUBFUN xmlAttribute *
+		xmlGetDtdQAttrDesc	(xmlDtd *dtd,
 					 const xmlChar *elem,
 					 const xmlChar *name,
 					 const xmlChar *prefix);
-XMLPUBFUN xmlNotationPtr
-		xmlGetDtdNotationDesc	(xmlDtdPtr dtd,
+XMLPUBFUN xmlNotation *
+		xmlGetDtdNotationDesc	(xmlDtd *dtd,
 					 const xmlChar *name);
-XMLPUBFUN xmlElementPtr
-		xmlGetDtdQElementDesc	(xmlDtdPtr dtd,
+XMLPUBFUN xmlElement *
+		xmlGetDtdQElementDesc	(xmlDtd *dtd,
 					 const xmlChar *name,
 					 const xmlChar *prefix);
-XMLPUBFUN xmlElementPtr
-		xmlGetDtdElementDesc	(xmlDtdPtr dtd,
+XMLPUBFUN xmlElement *
+		xmlGetDtdElementDesc	(xmlDtd *dtd,
 					 const xmlChar *name);
 
 #ifdef LIBXML_VALID_ENABLED
@@ -434,6 +401,7 @@ XMLPUBFUN int
 					 int *len,
 					 int max);
 
+/* only needed for `xmllint --insert` */
 XMLPUBFUN int
 		xmlValidGetValidElements(xmlNode *prev,
 					 xmlNode *next,
@@ -454,28 +422,30 @@ XMLPUBFUN int
  */
 XML_DEPRECATED
 XMLPUBFUN int
-		xmlValidBuildContentModel(xmlValidCtxtPtr ctxt,
-					 xmlElementPtr elem);
+		xmlValidBuildContentModel(xmlValidCtxt *ctxt,
+					 xmlElement *elem);
 
 XML_DEPRECATED
 XMLPUBFUN int
-		xmlValidatePushElement	(xmlValidCtxtPtr ctxt,
-					 xmlDocPtr doc,
-					 xmlNodePtr elem,
+		xmlValidatePushElement	(xmlValidCtxt *ctxt,
+					 xmlDoc *doc,
+					 xmlNode *elem,
 					 const xmlChar *qname);
 XML_DEPRECATED
 XMLPUBFUN int
-		xmlValidatePushCData	(xmlValidCtxtPtr ctxt,
+		xmlValidatePushCData	(xmlValidCtxt *ctxt,
 					 const xmlChar *data,
 					 int len);
 XML_DEPRECATED
 XMLPUBFUN int
-		xmlValidatePopElement	(xmlValidCtxtPtr ctxt,
-					 xmlDocPtr doc,
-					 xmlNodePtr elem,
+		xmlValidatePopElement	(xmlValidCtxt *ctxt,
+					 xmlDoc *doc,
+					 xmlNode *elem,
 					 const xmlChar *qname);
 #endif /* LIBXML_REGEXP_ENABLED */
+
 #endif /* LIBXML_VALID_ENABLED */
+
 #ifdef __cplusplus
 }
 #endif