From a40f36e7f2e801cffb8e7cd1d89fea0e2fe73b4e Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Wed, 14 May 2025 04:04:28 +0200 Subject: [PATCH] include: Stop using *Ptr typedefs in public headers --- HTMLparser.c | 90 +++--- HTMLtree.c | 38 +-- SAX2.c | 12 +- buf.c | 74 ++--- c14n.c | 12 +- catalog.c | 28 +- debugXML.c | 20 +- dict.c | 28 +- encoding.c | 20 +- entities.c | 44 +-- error.c | 4 +- hash.c | 64 ++-- include/libxml/HTMLparser.h | 88 +++--- include/libxml/HTMLtree.h | 54 ++-- include/libxml/SAX2.h | 12 +- include/libxml/c14n.h | 22 +- include/libxml/catalog.h | 28 +- include/libxml/debugXML.h | 20 +- include/libxml/dict.h | 24 +- include/libxml/encoding.h | 14 +- include/libxml/entities.h | 48 +-- include/libxml/hash.h | 62 ++-- include/libxml/list.h | 64 ++-- include/libxml/parser.h | 324 ++++++++++---------- include/libxml/parserInternals.h | 180 +++++------ include/libxml/pattern.h | 36 +-- include/libxml/relaxng.h | 66 ++-- include/libxml/schemasInternals.h | 108 +++---- include/libxml/schematron.h | 46 +-- include/libxml/threads.h | 16 +- include/libxml/tree.h | 488 +++++++++++++++--------------- include/libxml/uri.h | 21 +- include/libxml/valid.h | 288 +++++++++--------- include/libxml/xinclude.h | 30 +- include/libxml/xlink.h | 16 +- include/libxml/xmlIO.h | 100 +++--- include/libxml/xmlautomata.h | 110 +++---- include/libxml/xmlerror.h | 4 +- include/libxml/xmlmodule.h | 8 +- include/libxml/xmlreader.h | 200 ++++++------ include/libxml/xmlregexp.h | 26 +- include/libxml/xmlsave.h | 30 +- include/libxml/xmlschemas.h | 74 ++--- include/libxml/xmlschemastypes.h | 98 +++--- include/libxml/xmlwriter.h | 172 +++++------ include/libxml/xpath.h | 154 +++++----- include/libxml/xpathInternals.h | 344 ++++++++++----------- include/libxml/xpointer.h | 12 +- include/private/buf.h | 32 +- include/private/dict.h | 2 +- include/private/enc.h | 4 +- include/private/html.h | 6 +- include/private/io.h | 12 +- include/private/lint.h | 2 +- include/private/parser.h | 62 ++-- include/private/regexp.h | 2 +- include/private/save.h | 8 +- include/private/threads.h | 8 +- include/private/tree.h | 14 +- include/private/xinclude.h | 2 +- include/private/xpath.h | 4 +- list.c | 58 ++-- parser.c | 292 +++++++++--------- parserInternals.c | 188 ++++++------ pattern.c | 34 +-- python/generator.py | 277 ++++++++--------- relaxng.c | 70 ++--- schematron.c | 26 +- shell.c | 2 +- threads.c | 24 +- tree.c | 324 ++++++++++---------- uri.c | 16 +- valid.c | 200 ++++++------ xinclude.c | 30 +- xlink.c | 6 +- xmlIO.c | 80 ++--- xmlmodule.c | 8 +- xmlreader.c | 194 ++++++------ xmlregexp.c | 250 +++++++-------- xmlsave.c | 70 ++--- xmlschemas.c | 84 ++--- xmlschemastypes.c | 80 ++--- xmlwriter.c | 172 +++++------ xpath.c | 410 ++++++++++++------------- xpointer.c | 8 +- 85 files changed, 3421 insertions(+), 3461 deletions(-) diff --git a/HTMLparser.c b/HTMLparser.c index d450fc75..1c5a7864 100644 --- a/HTMLparser.c +++ b/HTMLparser.c @@ -1435,7 +1435,7 @@ htmlAutoClose(htmlParserCtxtPtr ctxt, const xmlChar * newtag) * @returns 1 if autoclose, 0 otherwise */ int -htmlAutoCloseTag(htmlDocPtr doc, const xmlChar *name, htmlNodePtr elem) { +htmlAutoCloseTag(xmlDoc *doc, const xmlChar *name, xmlNode *elem) { htmlNodePtr child; if (elem == NULL) return(1); @@ -1461,7 +1461,7 @@ htmlAutoCloseTag(htmlDocPtr doc, const xmlChar *name, htmlNodePtr elem) { * @returns 1 if autoclosed, 0 otherwise */ int -htmlIsAutoClosed(htmlDocPtr doc, htmlNodePtr elem) { +htmlIsAutoClosed(xmlDoc *doc, xmlNode *elem) { htmlNodePtr child; if (elem == NULL) return(1); @@ -2225,7 +2225,7 @@ static int areBlanks(htmlParserCtxtPtr ctxt, const xmlChar *str, int len) { * @param ExternalID the external ID of the DTD, or NULL * @returns a new document, do not initialize the DTD if not provided */ -htmlDocPtr +xmlDoc * htmlNewDocNoDtD(const xmlChar *URI, const xmlChar *ExternalID) { xmlDocPtr cur; @@ -2275,7 +2275,7 @@ htmlNewDocNoDtD(const xmlChar *URI, const xmlChar *ExternalID) { * @param ExternalID the external ID of the DTD, or NULL * @returns a new document */ -htmlDocPtr +xmlDoc * htmlNewDoc(const xmlChar *URI, const xmlChar *ExternalID) { if ((URI == NULL) && (ExternalID == NULL)) return(htmlNewDocNoDtD( @@ -2855,7 +2855,7 @@ error: * @returns NULL. */ const htmlEntityDesc * -htmlParseEntityRef(htmlParserCtxtPtr ctxt ATTRIBUTE_UNUSED, +htmlParseEntityRef(htmlParserCtxt *ctxt ATTRIBUTE_UNUSED, const xmlChar **str ATTRIBUTE_UNUSED) { return(NULL); } @@ -3407,7 +3407,7 @@ htmlParseComment(htmlParserCtxtPtr ctxt, int bogus) { * @returns 0 */ int -htmlParseCharRef(htmlParserCtxtPtr ctxt ATTRIBUTE_UNUSED) { +htmlParseCharRef(htmlParserCtxt *ctxt ATTRIBUTE_UNUSED) { return(0); } @@ -4255,7 +4255,7 @@ htmlParseElementInternal(htmlParserCtxtPtr ctxt) { * @param ctxt an HTML parser context */ void -htmlParseElement(htmlParserCtxtPtr ctxt) { +htmlParseElement(htmlParserCtxt *ctxt) { const xmlChar *oldptr; int depth; @@ -4286,8 +4286,8 @@ htmlParseElement(htmlParserCtxtPtr ctxt) { * @param input parser input * @returns a node list. */ -xmlNodePtr -htmlCtxtParseContentInternal(htmlParserCtxtPtr ctxt, xmlParserInputPtr input) { +xmlNode * +htmlCtxtParseContentInternal(htmlParserCtxt *ctxt, xmlParserInput *input) { xmlNodePtr root; xmlNodePtr list = NULL; xmlChar *rootName = BAD_CAST "#root"; @@ -4345,7 +4345,7 @@ htmlCtxtParseContentInternal(htmlParserCtxtPtr ctxt, xmlParserInputPtr input) { * @returns 0, -1 in case of error. */ int -htmlParseDocument(htmlParserCtxtPtr ctxt) { +htmlParseDocument(htmlParserCtxt *ctxt) { if ((ctxt == NULL) || (ctxt->input == NULL)) return(-1); @@ -4549,7 +4549,7 @@ htmlInitParserCtxt(htmlParserCtxtPtr ctxt, const htmlSAXHandler *sax, * @param ctxt an HTML parser context */ void -htmlFreeParserCtxt(htmlParserCtxtPtr ctxt) +htmlFreeParserCtxt(htmlParserCtxt *ctxt) { xmlFreeParserCtxt(ctxt); } @@ -4568,7 +4568,7 @@ htmlFreeParserCtxt(htmlParserCtxtPtr ctxt) * * @returns the htmlParserCtxtPtr or NULL in case of allocation error */ -htmlParserCtxtPtr +htmlParserCtxt * htmlNewParserCtxt(void) { return(htmlNewSAXParserCtxt(NULL, NULL)); @@ -4589,7 +4589,7 @@ htmlNewParserCtxt(void) * @param userData user data * @returns the htmlParserCtxtPtr or NULL in case of allocation error */ -htmlParserCtxtPtr +htmlParserCtxt * htmlNewSAXParserCtxt(const htmlSAXHandler *sax, void *userData) { xmlParserCtxtPtr ctxt; @@ -4646,7 +4646,7 @@ htmlCreateMemoryParserCtxtInternal(const char *url, * @param size the size of the array * @returns the new parser context or NULL */ -htmlParserCtxtPtr +htmlParserCtxt * htmlCreateMemoryParserCtxt(const char *buffer, int size) { if (size <= 0) return(NULL); @@ -5123,7 +5123,7 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) { * @returns an xmlParserErrors code (0 on success). */ int -htmlParseChunk(htmlParserCtxtPtr ctxt, const char *chunk, int size, +htmlParseChunk(htmlParserCtxt *ctxt, const char *chunk, int size, int terminate) { if ((ctxt == NULL) || (ctxt->input == NULL) || (ctxt->input->buf == NULL) || @@ -5184,8 +5184,8 @@ htmlParseChunk(htmlParserCtxtPtr ctxt, const char *chunk, int size, * @returns the new parser context or NULL if a memory allocation * failed. */ -htmlParserCtxtPtr -htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax, void *user_data, +htmlParserCtxt * +htmlCreatePushParserCtxt(htmlSAXHandler *sax, void *user_data, const char *chunk, int size, const char *filename, xmlCharEncoding enc) { htmlParserCtxtPtr ctxt; @@ -5231,9 +5231,9 @@ htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax, void *user_data, * not well formed. */ -htmlDocPtr +xmlDoc * htmlSAXParseDoc(const xmlChar *cur, const char *encoding, - htmlSAXHandlerPtr sax, void *userData) { + htmlSAXHandler *sax, void *userData) { htmlDocPtr ret; htmlParserCtxtPtr ctxt; @@ -5268,7 +5268,7 @@ htmlSAXParseDoc(const xmlChar *cur, const char *encoding, * @returns the resulting document tree */ -htmlDocPtr +xmlDoc * htmlParseDoc(const xmlChar *cur, const char *encoding) { return(htmlSAXParseDoc(cur, encoding, NULL, NULL)); } @@ -5288,7 +5288,7 @@ htmlParseDoc(const xmlChar *cur, const char *encoding) { * @param encoding optional encoding * @returns the new parser context or NULL if a memory allocation failed. */ -htmlParserCtxtPtr +htmlParserCtxt * htmlCreateFileParserCtxt(const char *filename, const char *encoding) { htmlParserCtxtPtr ctxt; @@ -5332,8 +5332,8 @@ htmlCreateFileParserCtxt(const char *filename, const char *encoding) * not well formed. */ -htmlDocPtr -htmlSAXParseFile(const char *filename, const char *encoding, htmlSAXHandlerPtr sax, +xmlDoc * +htmlSAXParseFile(const char *filename, const char *encoding, htmlSAXHandler *sax, void *userData) { htmlDocPtr ret; htmlParserCtxtPtr ctxt; @@ -5367,7 +5367,7 @@ htmlSAXParseFile(const char *filename, const char *encoding, htmlSAXHandlerPtr s * @returns the resulting document tree */ -htmlDocPtr +xmlDoc * htmlParseFile(const char *filename, const char *encoding) { return(htmlSAXParseFile(filename, encoding, NULL, NULL)); } @@ -5439,7 +5439,7 @@ htmlAttrAllowed(const htmlElemDesc* elt ATTRIBUTE_UNUSED, * @returns HTML_VALID */ htmlStatus -htmlNodeStatus(htmlNodePtr node ATTRIBUTE_UNUSED, +htmlNodeStatus(xmlNode *node ATTRIBUTE_UNUSED, int legacy ATTRIBUTE_UNUSED) { return(HTML_VALID); } @@ -5466,7 +5466,7 @@ htmlNodeStatus(htmlNodePtr node ATTRIBUTE_UNUSED, * @param ctxt an HTML parser context */ void -htmlCtxtReset(htmlParserCtxtPtr ctxt) +htmlCtxtReset(htmlParserCtxt *ctxt) { xmlParserInputPtr input; xmlDictPtr dict; @@ -5623,7 +5623,7 @@ htmlCtxtSetOptionsInternal(xmlParserCtxtPtr ctxt, int options, int keepMask) * in case of error. */ int -htmlCtxtSetOptions(htmlParserCtxtPtr ctxt, int options) +htmlCtxtSetOptions(htmlParserCtxt *ctxt, int options) { return(htmlCtxtSetOptionsInternal(ctxt, options, 0)); } @@ -5649,7 +5649,7 @@ htmlCtxtSetOptions(htmlParserCtxtPtr ctxt, int options) * in case of error. */ int -htmlCtxtUseOptions(htmlParserCtxtPtr ctxt, int options) +htmlCtxtUseOptions(htmlParserCtxt *ctxt, int options) { int keepMask; @@ -5677,8 +5677,8 @@ htmlCtxtUseOptions(htmlParserCtxtPtr ctxt, int options) * @param input parser input * @returns the resulting document tree or NULL */ -htmlDocPtr -htmlCtxtParseDocument(htmlParserCtxtPtr ctxt, xmlParserInputPtr input) +xmlDoc * +htmlCtxtParseDocument(htmlParserCtxt *ctxt, xmlParserInput *input) { htmlDocPtr ret; @@ -5721,7 +5721,7 @@ htmlCtxtParseDocument(htmlParserCtxtPtr ctxt, xmlParserInputPtr input) * @param options a combination of htmlParserOption values * @returns the resulting document tree. */ -htmlDocPtr +xmlDoc * htmlReadDoc(const xmlChar *str, const char *url, const char *encoding, int options) { @@ -5756,7 +5756,7 @@ htmlReadDoc(const xmlChar *str, const char *url, const char *encoding, * @param options a combination of htmlParserOption values * @returns the resulting document tree. */ -htmlDocPtr +xmlDoc * htmlReadFile(const char *filename, const char *encoding, int options) { htmlParserCtxtPtr ctxt; @@ -5791,7 +5791,7 @@ htmlReadFile(const char *filename, const char *encoding, int options) * @param options a combination of htmlParserOption values * @returns the resulting document tree */ -htmlDocPtr +xmlDoc * htmlReadMemory(const char *buffer, int size, const char *url, const char *encoding, int options) { @@ -5833,7 +5833,7 @@ htmlReadMemory(const char *buffer, int size, const char *url, * @param options a combination of htmlParserOption values * @returns the resulting document tree */ -htmlDocPtr +xmlDoc * htmlReadFd(int fd, const char *url, const char *encoding, int options) { htmlParserCtxtPtr ctxt; @@ -5869,7 +5869,7 @@ htmlReadFd(int fd, const char *url, const char *encoding, int options) * @param options a combination of htmlParserOption values * @returns the resulting document tree */ -htmlDocPtr +xmlDoc * htmlReadIO(xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void *ioctx, const char *url, const char *encoding, int options) { @@ -5905,8 +5905,8 @@ htmlReadIO(xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, * @param options a combination of htmlParserOption values * @returns the resulting document tree */ -htmlDocPtr -htmlCtxtReadDoc(xmlParserCtxtPtr ctxt, const xmlChar *str, +xmlDoc * +htmlCtxtReadDoc(xmlParserCtxt *ctxt, const xmlChar *str, const char *URL, const char *encoding, int options) { xmlParserInputPtr input; @@ -5937,8 +5937,8 @@ htmlCtxtReadDoc(xmlParserCtxtPtr ctxt, const xmlChar *str, * @param options a combination of htmlParserOption values * @returns the resulting document tree */ -htmlDocPtr -htmlCtxtReadFile(xmlParserCtxtPtr ctxt, const char *filename, +xmlDoc * +htmlCtxtReadFile(xmlParserCtxt *ctxt, const char *filename, const char *encoding, int options) { xmlParserInputPtr input; @@ -5970,8 +5970,8 @@ htmlCtxtReadFile(xmlParserCtxtPtr ctxt, const char *filename, * @param options a combination of htmlParserOption values * @returns the resulting document tree */ -htmlDocPtr -htmlCtxtReadMemory(xmlParserCtxtPtr ctxt, const char *buffer, int size, +xmlDoc * +htmlCtxtReadMemory(xmlParserCtxt *ctxt, const char *buffer, int size, const char *URL, const char *encoding, int options) { xmlParserInputPtr input; @@ -6005,8 +6005,8 @@ htmlCtxtReadMemory(xmlParserCtxtPtr ctxt, const char *buffer, int size, * @param options a combination of htmlParserOption values * @returns the resulting document tree */ -htmlDocPtr -htmlCtxtReadFd(xmlParserCtxtPtr ctxt, int fd, +xmlDoc * +htmlCtxtReadFd(xmlParserCtxt *ctxt, int fd, const char *URL, const char *encoding, int options) { xmlParserInputPtr input; @@ -6038,8 +6038,8 @@ htmlCtxtReadFd(xmlParserCtxtPtr ctxt, int fd, * @param options a combination of htmlParserOption values * @returns the resulting document tree */ -htmlDocPtr -htmlCtxtReadIO(xmlParserCtxtPtr ctxt, xmlInputReadCallback ioread, +xmlDoc * +htmlCtxtReadIO(xmlParserCtxt *ctxt, xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void *ioctx, const char *URL, const char *encoding, int options) diff --git a/HTMLtree.c b/HTMLtree.c index 45d422ad..6ceec614 100644 --- a/HTMLtree.c +++ b/HTMLtree.c @@ -261,7 +261,7 @@ htmlUpdateMetaEncoding(htmlMetaEncoding *menc, const char *encoding) { * @returns the encoding ot NULL if not found. */ const xmlChar * -htmlGetMetaEncoding(htmlDocPtr doc) { +htmlGetMetaEncoding(xmlDoc *doc) { htmlNodePtr head, node; head = htmlFindHead(doc); @@ -296,7 +296,7 @@ htmlGetMetaEncoding(htmlDocPtr doc) { * arguments are invalid and -1 if memory allocation failed. */ int -htmlSetMetaEncoding(htmlDocPtr doc, const xmlChar *encoding) { +htmlSetMetaEncoding(xmlDoc *doc, const xmlChar *encoding) { htmlNodePtr head, meta; int found = 0; @@ -508,7 +508,7 @@ htmlBufNodeDumpFormat(xmlBufPtr buf, xmlDocPtr doc ATTRIBUTE_UNUSED, * @returns the number of bytes written or -1 in case of error */ int -htmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur) { +htmlNodeDump(xmlBuffer *buf, xmlDoc *doc, xmlNode *cur) { xmlBufPtr buffer; size_t ret1; int ret2; @@ -545,8 +545,8 @@ htmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur) { * @returns the number of bytes written or -1 in case of failure. */ int -htmlNodeDumpFileFormat(FILE *out, xmlDocPtr doc ATTRIBUTE_UNUSED, - xmlNodePtr cur, const char *encoding, int format) { +htmlNodeDumpFileFormat(FILE *out, xmlDoc *doc ATTRIBUTE_UNUSED, + xmlNode *cur, const char *encoding, int format) { xmlOutputBufferPtr buf; xmlCharEncodingHandlerPtr handler; int ret; @@ -580,7 +580,7 @@ htmlNodeDumpFileFormat(FILE *out, xmlDocPtr doc ATTRIBUTE_UNUSED, * @param cur the current node */ void -htmlNodeDumpFile(FILE *out, xmlDocPtr doc, xmlNodePtr cur) { +htmlNodeDumpFile(FILE *out, xmlDoc *doc, xmlNode *cur) { htmlNodeDumpFileFormat(out, doc, cur, NULL, 1); } @@ -599,7 +599,7 @@ htmlNodeDumpFile(FILE *out, xmlDocPtr doc, xmlNodePtr cur) { * @param format should formatting newlines been added */ void -htmlDocDumpMemoryFormat(xmlDocPtr cur, xmlChar**mem, int *size, int format) { +htmlDocDumpMemoryFormat(xmlDoc *cur, xmlChar**mem, int *size, int format) { xmlOutputBufferPtr buf; xmlCharEncodingHandlerPtr handler = NULL; @@ -648,7 +648,7 @@ htmlDocDumpMemoryFormat(xmlDocPtr cur, xmlChar**mem, int *size, int format) { * @param size OUT: the memory length */ void -htmlDocDumpMemory(xmlDocPtr cur, xmlChar**mem, int *size) { +htmlDocDumpMemory(xmlDoc *cur, xmlChar**mem, int *size) { htmlDocDumpMemoryFormat(cur, mem, size, 1); } @@ -829,7 +829,7 @@ htmlAttrDumpOutput(xmlOutputBufferPtr buf, xmlAttrPtr cur) { * @param format should formatting newlines been added */ void -htmlNodeDumpInternal(xmlOutputBufferPtr buf, xmlNodePtr cur, +htmlNodeDumpInternal(xmlOutputBuffer *buf, xmlNode *cur, const char *encoding, int format) { xmlNodePtr root, parent, metaHead = NULL; xmlAttrPtr attr; @@ -1125,8 +1125,8 @@ htmlNodeDumpInternal(xmlOutputBufferPtr buf, xmlNodePtr cur, * @param format should formatting newlines been added */ void -htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, - xmlDocPtr doc ATTRIBUTE_UNUSED, xmlNodePtr cur, +htmlNodeDumpFormatOutput(xmlOutputBuffer *buf, + xmlDoc *doc ATTRIBUTE_UNUSED, xmlNode *cur, const char *encoding ATTRIBUTE_UNUSED, int format) { htmlNodeDumpInternal(buf, cur, NULL, format); } @@ -1142,8 +1142,8 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, * @param encoding the encoding string (unused) */ void -htmlNodeDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc ATTRIBUTE_UNUSED, - xmlNodePtr cur, const char *encoding ATTRIBUTE_UNUSED) { +htmlNodeDumpOutput(xmlOutputBuffer *buf, xmlDoc *doc ATTRIBUTE_UNUSED, + xmlNode *cur, const char *encoding ATTRIBUTE_UNUSED) { htmlNodeDumpInternal(buf, cur, NULL, 1); } @@ -1156,7 +1156,7 @@ htmlNodeDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc ATTRIBUTE_UNUSED, * @param format should formatting newlines been added */ void -htmlDocContentDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr cur, +htmlDocContentDumpFormatOutput(xmlOutputBuffer *buf, xmlDoc *cur, const char *encoding ATTRIBUTE_UNUSED, int format) { htmlNodeDumpInternal(buf, (xmlNodePtr) cur, NULL, format); @@ -1172,7 +1172,7 @@ htmlDocContentDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr cur, * @param encoding the encoding string (unused) */ void -htmlDocContentDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr cur, +htmlDocContentDumpOutput(xmlOutputBuffer *buf, xmlDoc *cur, const char *encoding ATTRIBUTE_UNUSED) { htmlNodeDumpInternal(buf, (xmlNodePtr) cur, NULL, 1); } @@ -1202,7 +1202,7 @@ htmlDocContentDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr cur, * @returns the number of bytes written or -1 in case of failure. */ int -htmlDocDump(FILE *f, xmlDocPtr cur) { +htmlDocDump(FILE *f, xmlDoc *cur) { xmlOutputBufferPtr buf; xmlCharEncodingHandlerPtr handler = NULL; int ret; @@ -1240,7 +1240,7 @@ htmlDocDump(FILE *f, xmlDocPtr cur) { * @returns the number of bytes written or -1 in case of failure. */ int -htmlSaveFile(const char *filename, xmlDocPtr cur) { +htmlSaveFile(const char *filename, xmlDoc *cur) { return(htmlSaveFileFormat(filename, cur, NULL, 1)); } @@ -1263,7 +1263,7 @@ htmlSaveFile(const char *filename, xmlDocPtr cur) { * @returns the number of bytes written or -1 in case of failure. */ int -htmlSaveFileFormat(const char *filename, xmlDocPtr cur, +htmlSaveFileFormat(const char *filename, xmlDoc *cur, const char *encoding, int format) { xmlOutputBufferPtr buf; xmlCharEncodingHandlerPtr handler = NULL; @@ -1305,7 +1305,7 @@ htmlSaveFileFormat(const char *filename, xmlDocPtr cur, * @returns the number of bytes written or -1 in case of failure. */ int -htmlSaveFileEnc(const char *filename, xmlDocPtr cur, const char *encoding) { +htmlSaveFileEnc(const char *filename, xmlDoc *cur, const char *encoding) { return(htmlSaveFileFormat(filename, cur, encoding, 1)); } diff --git a/SAX2.c b/SAX2.c index 0e4f2cbd..3f0bf87d 100644 --- a/SAX2.c +++ b/SAX2.c @@ -370,7 +370,7 @@ error: * @param systemId The system ID of the entity * @returns a parser input. */ -xmlParserInputPtr +xmlParserInput * xmlSAX2ResolveEntity(void *ctx, const xmlChar *publicId, const xmlChar *systemId) { @@ -429,7 +429,7 @@ xmlSAX2ResolveEntity(void *ctx, const xmlChar *publicId, * @param name The entity name * @returns the xmlEntityPtr if found. */ -xmlEntityPtr +xmlEntity * xmlSAX2GetEntity(void *ctx, const xmlChar *name) { xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; @@ -473,7 +473,7 @@ xmlSAX2GetEntity(void *ctx, const xmlChar *name) * @param name The entity name * @returns the xmlEntityPtr if found. */ -xmlEntityPtr +xmlEntity * xmlSAX2GetParameterEntity(void *ctx, const xmlChar *name) { xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; @@ -593,7 +593,7 @@ xmlSAX2EntityDecl(void *ctx, const xmlChar *name, int type, void xmlSAX2AttributeDecl(void *ctx, const xmlChar *elem, const xmlChar *fullname, int type, int def, const xmlChar *defaultValue, - xmlEnumerationPtr tree) + xmlEnumeration *tree) { xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; xmlAttributePtr attr; @@ -658,7 +658,7 @@ xmlSAX2AttributeDecl(void *ctx, const xmlChar *elem, const xmlChar *fullname, */ void xmlSAX2ElementDecl(void *ctx, const xmlChar * name, int type, - xmlElementContentPtr content) + xmlElementContent *content) { xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; xmlElementPtr elem = NULL; @@ -764,7 +764,7 @@ xmlSAX2UnparsedEntityDecl(void *ctx, const xmlChar *name, * @param loc A SAX Locator */ void -xmlSAX2SetDocumentLocator(void *ctx ATTRIBUTE_UNUSED, xmlSAXLocatorPtr loc ATTRIBUTE_UNUSED) +xmlSAX2SetDocumentLocator(void *ctx ATTRIBUTE_UNUSED, xmlSAXLocator *loc ATTRIBUTE_UNUSED) { } diff --git a/buf.c b/buf.c index a42fdd46..43d8ebfd 100644 --- a/buf.c +++ b/buf.c @@ -116,7 +116,7 @@ xmlBufOverflowError(xmlBufPtr buf) * @param size initial buffer size * @returns the new structure */ -xmlBufPtr +xmlBuf * xmlBufCreate(size_t size) { xmlBufPtr ret; @@ -157,7 +157,7 @@ xmlBufCreate(size_t size) { * @param isStatic whether the memory area is static * @returns a new buffer. */ -xmlBufPtr +xmlBuf * xmlBufCreateMem(const xmlChar *mem, size_t size, int isStatic) { xmlBufPtr ret; @@ -208,7 +208,7 @@ xmlBufCreateMem(const xmlChar *mem, size_t size, int isStatic) { * @returns the buffer content */ xmlChar * -xmlBufDetach(xmlBufPtr buf) { +xmlBufDetach(xmlBuf *buf) { xmlChar *ret; if ((buf == NULL) || (BUF_ERROR(buf)) || (BUF_STATIC(buf))) @@ -236,7 +236,7 @@ xmlBufDetach(xmlBufPtr buf) { * @param buf the buffer to free */ void -xmlBufFree(xmlBufPtr buf) { +xmlBufFree(xmlBuf *buf) { if (buf == NULL) return; @@ -251,7 +251,7 @@ xmlBufFree(xmlBufPtr buf) { * @param buf the buffer */ void -xmlBufEmpty(xmlBufPtr buf) { +xmlBufEmpty(xmlBuf *buf) { if ((buf == NULL) || (BUF_ERROR(buf)) || (BUF_STATIC(buf))) return; if (buf->mem == NULL) @@ -280,7 +280,7 @@ xmlBufEmpty(xmlBufPtr buf) { * @returns the number of bytes removed or 0 in case of failure */ size_t -xmlBufShrink(xmlBufPtr buf, size_t len) { +xmlBufShrink(xmlBuf *buf, size_t len) { if ((buf == NULL) || (BUF_ERROR(buf))) return(0); if (len == 0) @@ -379,7 +379,7 @@ xmlBufGrowInternal(xmlBufPtr buf, size_t len) { * @returns 0 on success, -1 in case of error */ int -xmlBufGrow(xmlBufPtr buf, size_t len) { +xmlBufGrow(xmlBuf *buf, size_t len) { if ((buf == NULL) || (BUF_ERROR(buf)) || (BUF_STATIC(buf))) return(-1); CHECK_COMPAT(buf) @@ -416,7 +416,7 @@ xmlBufContent(const xmlBuf *buf) * @returns the end of the internal content or NULL in case of error */ xmlChar * -xmlBufEnd(xmlBufPtr buf) +xmlBufEnd(xmlBuf *buf) { if ((!buf) || (BUF_ERROR(buf))) return NULL; @@ -436,7 +436,7 @@ xmlBufEnd(xmlBufPtr buf) * @returns 0 on success, -1 in case of error */ int -xmlBufAddLen(xmlBufPtr buf, size_t len) { +xmlBufAddLen(xmlBuf *buf, size_t len) { if ((buf == NULL) || (BUF_ERROR(buf)) || (BUF_STATIC(buf))) return(-1); CHECK_COMPAT(buf) @@ -455,7 +455,7 @@ xmlBufAddLen(xmlBufPtr buf, size_t len) { * @returns size of buffer content in bytes */ size_t -xmlBufUse(const xmlBufPtr buf) +xmlBufUse(xmlBuf *buf) { if ((!buf) || (BUF_ERROR(buf))) return 0; @@ -471,7 +471,7 @@ xmlBufUse(const xmlBufPtr buf) * @returns available space in bytes */ size_t -xmlBufAvail(const xmlBufPtr buf) +xmlBufAvail(xmlBuf *buf) { if ((!buf) || (BUF_ERROR(buf))) return 0; @@ -487,7 +487,7 @@ xmlBufAvail(const xmlBufPtr buf) * @returns 0 if no, 1 if yes and -1 in case of error */ int -xmlBufIsEmpty(const xmlBufPtr buf) +xmlBufIsEmpty(xmlBuf *buf) { if ((!buf) || (BUF_ERROR(buf))) return(-1); @@ -507,7 +507,7 @@ xmlBufIsEmpty(const xmlBufPtr buf) * @returns 0 if successful, -1 in case of error. */ int -xmlBufAdd(xmlBufPtr buf, const xmlChar *str, size_t len) { +xmlBufAdd(xmlBuf *buf, const xmlChar *str, size_t len) { if ((buf == NULL) || (BUF_ERROR(buf)) || (BUF_STATIC(buf))) return(-1); if (len == 0) @@ -537,7 +537,7 @@ xmlBufAdd(xmlBufPtr buf, const xmlChar *str, size_t len) { * @returns 0 if successful, -1 in case of error. */ int -xmlBufCat(xmlBufPtr buf, const xmlChar *str) { +xmlBufCat(xmlBuf *buf, const xmlChar *str) { if (str == NULL) return(0); return(xmlBufAdd(buf, str, strlen((const char *) str))); @@ -552,8 +552,8 @@ xmlBufCat(xmlBufPtr buf, const xmlChar *str) { * @param buffer incoming old buffer to convert to a new one * @returns a new xmlBufPtr unless the call failed and NULL is returned */ -xmlBufPtr -xmlBufFromBuffer(xmlBufferPtr buffer) { +xmlBuf * +xmlBufFromBuffer(xmlBuffer *buffer) { xmlBufPtr ret; if (buffer == NULL) @@ -600,7 +600,7 @@ xmlBufFromBuffer(xmlBufferPtr buffer) { * @returns 0 on success, -1 on error. */ int -xmlBufBackToBuffer(xmlBufPtr buf, xmlBufferPtr ret) { +xmlBufBackToBuffer(xmlBuf *buf, xmlBuffer *ret) { if ((buf == NULL) || (ret == NULL)) return(-1); @@ -639,7 +639,7 @@ xmlBufBackToBuffer(xmlBufPtr buf, xmlBufferPtr ret) { * @returns 0 on success, -1 in case of error. */ int -xmlBufResetInput(xmlBufPtr buf, xmlParserInputPtr input) { +xmlBufResetInput(xmlBuf *buf, xmlParserInput *input) { return(xmlBufUpdateInput(buf, input, 0)); } @@ -656,7 +656,7 @@ xmlBufResetInput(xmlBufPtr buf, xmlParserInputPtr input) { * @returns 0 on success, -1 in case of error. */ int -xmlBufUpdateInput(xmlBufPtr buf, xmlParserInputPtr input, size_t pos) { +xmlBufUpdateInput(xmlBuf *buf, xmlParserInput *input, size_t pos) { if ((buf == NULL) || (input == NULL)) return(-1); CHECK_COMPAT(buf) @@ -702,7 +702,7 @@ xmlGetBufferAllocationScheme(void) { * * @returns the new structure. */ -xmlBufferPtr +xmlBuffer * xmlBufferCreate(void) { xmlBufferPtr ret; @@ -730,7 +730,7 @@ xmlBufferCreate(void) { * @param size initial size of buffer * @returns the new structure. */ -xmlBufferPtr +xmlBuffer * xmlBufferCreateSize(size_t size) { xmlBufferPtr ret; @@ -773,7 +773,7 @@ xmlBufferCreateSize(size_t size) { * @returns the buffer content */ xmlChar * -xmlBufferDetach(xmlBufferPtr buf) { +xmlBufferDetach(xmlBuffer *buf) { xmlChar *ret; if (buf == NULL) @@ -806,7 +806,7 @@ xmlBufferDetach(xmlBufferPtr buf) { * @param size the size in bytes * @returns a new buffer */ -xmlBufferPtr +xmlBuffer * xmlBufferCreateStatic(void *mem, size_t size) { xmlBufferPtr buf = xmlBufferCreateSize(size); @@ -824,7 +824,7 @@ xmlBufferCreateStatic(void *mem, size_t size) { * @param scheme allocation scheme to use */ void -xmlBufferSetAllocationScheme(xmlBufferPtr buf ATTRIBUTE_UNUSED, +xmlBufferSetAllocationScheme(xmlBuffer *buf ATTRIBUTE_UNUSED, xmlBufferAllocationScheme scheme ATTRIBUTE_UNUSED) { } @@ -834,7 +834,7 @@ xmlBufferSetAllocationScheme(xmlBufferPtr buf ATTRIBUTE_UNUSED, * @param buf the buffer to free */ void -xmlBufferFree(xmlBufferPtr buf) { +xmlBufferFree(xmlBuffer *buf) { if (buf == NULL) return; @@ -852,7 +852,7 @@ xmlBufferFree(xmlBufferPtr buf) { * @param buf the buffer */ void -xmlBufferEmpty(xmlBufferPtr buf) { +xmlBufferEmpty(xmlBuffer *buf) { if (buf == NULL) return; if (buf->content == NULL) @@ -879,7 +879,7 @@ xmlBufferEmpty(xmlBufferPtr buf) { * @returns the number of bytes removed, or -1 in case of failure. */ int -xmlBufferShrink(xmlBufferPtr buf, unsigned int len) { +xmlBufferShrink(xmlBuffer *buf, unsigned int len) { if (buf == NULL) return(-1); if (len == 0) @@ -909,7 +909,7 @@ xmlBufferShrink(xmlBufferPtr buf, unsigned int len) { * @returns the new available space or -1 in case of error */ int -xmlBufferGrow(xmlBufferPtr buf, unsigned int len) { +xmlBufferGrow(xmlBuffer *buf, unsigned int len) { unsigned int size; xmlChar *newbuf; @@ -962,7 +962,7 @@ xmlBufferGrow(xmlBufferPtr buf, unsigned int len) { * @returns the number of bytes written */ int -xmlBufferDump(FILE *file, xmlBufferPtr buf) { +xmlBufferDump(FILE *file, xmlBuffer *buf) { size_t ret; if (buf == NULL) @@ -1015,7 +1015,7 @@ xmlBufferLength(const xmlBuffer *buf) * @returns 1 on succes, 0 in case of error */ int -xmlBufferResize(xmlBufferPtr buf, unsigned int size) +xmlBufferResize(xmlBuffer *buf, unsigned int size) { int res; @@ -1039,7 +1039,7 @@ xmlBufferResize(xmlBufferPtr buf, unsigned int size) * @returns an xmlParserErrors code. */ int -xmlBufferAdd(xmlBufferPtr buf, const xmlChar *str, int len) { +xmlBufferAdd(xmlBuffer *buf, const xmlChar *str, int len) { if ((buf == NULL) || (str == NULL)) return(XML_ERR_ARGUMENT); if (len < 0) @@ -1070,7 +1070,7 @@ xmlBufferAdd(xmlBufferPtr buf, const xmlChar *str, int len) { * @returns an xmlParserErrors code. */ int -xmlBufferAddHead(xmlBufferPtr buf, const xmlChar *str, int len) { +xmlBufferAddHead(xmlBuffer *buf, const xmlChar *str, int len) { unsigned start = 0; if ((buf == NULL) || (str == NULL)) @@ -1122,7 +1122,7 @@ xmlBufferAddHead(xmlBufferPtr buf, const xmlChar *str, int len) { * @returns an xmlParserErrors code. */ int -xmlBufferCat(xmlBufferPtr buf, const xmlChar *str) { +xmlBufferCat(xmlBuffer *buf, const xmlChar *str) { return(xmlBufferAdd(buf, str, -1)); } @@ -1134,7 +1134,7 @@ xmlBufferCat(xmlBufferPtr buf, const xmlChar *str) { * @returns an xmlParserErrors code. */ int -xmlBufferCCat(xmlBufferPtr buf, const char *str) { +xmlBufferCCat(xmlBuffer *buf, const char *str) { return(xmlBufferAdd(buf, (const xmlChar *) str, -1)); } @@ -1145,7 +1145,7 @@ xmlBufferCCat(xmlBufferPtr buf, const char *str) { * @param string the string to add */ void -xmlBufferWriteCHAR(xmlBufferPtr buf, const xmlChar *string) { +xmlBufferWriteCHAR(xmlBuffer *buf, const xmlChar *string) { xmlBufferAdd(buf, string, -1); } @@ -1158,7 +1158,7 @@ xmlBufferWriteCHAR(xmlBufferPtr buf, const xmlChar *string) { * @param string the string to add */ void -xmlBufferWriteChar(xmlBufferPtr buf, const char *string) { +xmlBufferWriteChar(xmlBuffer *buf, const char *string) { xmlBufferAdd(buf, (const xmlChar *) string, -1); } @@ -1173,7 +1173,7 @@ xmlBufferWriteChar(xmlBufferPtr buf, const char *string) { * @param string the string to add */ void -xmlBufferWriteQuotedString(xmlBufferPtr buf, const xmlChar *string) { +xmlBufferWriteQuotedString(xmlBuffer *buf, const xmlChar *string) { const xmlChar *cur, *base; if (buf == NULL) return; diff --git a/c14n.c b/c14n.c index 8a681dc4..cf60b59e 100644 --- a/c14n.c +++ b/c14n.c @@ -1815,9 +1815,9 @@ xmlC14NNewCtx(xmlDocPtr doc, * @returns non-negative value on success or a negative value on fail */ int -xmlC14NExecute(xmlDocPtr doc, xmlC14NIsVisibleCallback is_visible_callback, +xmlC14NExecute(xmlDoc *doc, xmlC14NIsVisibleCallback is_visible_callback, void* user_data, int mode, xmlChar **inclusive_ns_prefixes, - int with_comments, xmlOutputBufferPtr buf) { + int with_comments, xmlOutputBuffer *buf) { xmlC14NCtxPtr ctx; xmlC14NMode c14n_mode = XML_C14N_1_0; @@ -1914,9 +1914,9 @@ xmlC14NExecute(xmlDocPtr doc, xmlC14NIsVisibleCallback is_visible_callback, * @returns non-negative value on success or a negative value on fail */ int -xmlC14NDocSaveTo(xmlDocPtr doc, xmlNodeSetPtr nodes, +xmlC14NDocSaveTo(xmlDoc *doc, xmlNodeSet *nodes, int mode, xmlChar ** inclusive_ns_prefixes, - int with_comments, xmlOutputBufferPtr buf) { + int with_comments, xmlOutputBuffer *buf) { return(xmlC14NExecute(doc, xmlC14NIsNodeInNodeset, nodes, @@ -1947,7 +1947,7 @@ xmlC14NDocSaveTo(xmlDocPtr doc, xmlNodeSetPtr nodes, * @returns the number of bytes written on success or a negative value on fail */ int -xmlC14NDocDumpMemory(xmlDocPtr doc, xmlNodeSetPtr nodes, +xmlC14NDocDumpMemory(xmlDoc *doc, xmlNodeSet *nodes, int mode, xmlChar ** inclusive_ns_prefixes, int with_comments, xmlChar ** doc_txt_ptr) { @@ -2015,7 +2015,7 @@ xmlC14NDocDumpMemory(xmlDocPtr doc, xmlNodeSetPtr nodes, * @returns the number of bytes written success or a negative value on fail */ int -xmlC14NDocSave(xmlDocPtr doc, xmlNodeSetPtr nodes, +xmlC14NDocSave(xmlDoc *doc, xmlNodeSet *nodes, int mode, xmlChar ** inclusive_ns_prefixes, int with_comments, const char *filename, int compression) { diff --git a/catalog.c b/catalog.c index 0e846075..eeba614c 100644 --- a/catalog.c +++ b/catalog.c @@ -410,7 +410,7 @@ xmlCreateNewCatalog(xmlCatalogType type, xmlCatalogPrefer prefer) { * @param catal a Catalog */ void -xmlFreeCatalog(xmlCatalogPtr catal) { +xmlFreeCatalog(xmlCatalog *catal) { if (catal == NULL) return; if (catal->xml != NULL) @@ -765,7 +765,7 @@ xmlCatalogConvertEntry(void *payload, void *data, * @returns the number of entries converted if successful, -1 otherwise */ int -xmlConvertSGMLCatalog(xmlCatalogPtr catal) { +xmlConvertSGMLCatalog(xmlCatalog *catal) { if ((catal == NULL) || (catal->type != XML_SGML_CATALOG_TYPE)) return(-1); @@ -857,7 +857,7 @@ xmlCatalogUnWrapURN(const xmlChar *urn) { * @returns the resulting document tree or NULL in case of error */ -xmlDocPtr +xmlDoc * xmlParseCatalogFile(const char *filename) { xmlDocPtr ret; xmlParserCtxtPtr ctxt; @@ -2544,7 +2544,7 @@ xmlCatalogSGMLResolve(xmlCatalogPtr catal, const xmlChar *pubID, * @param filename a file path * @returns the catalog parsed or NULL in case of error */ -xmlCatalogPtr +xmlCatalog * xmlLoadSGMLSuperCatalog(const char *filename) { xmlChar *content; @@ -2579,7 +2579,7 @@ xmlLoadSGMLSuperCatalog(const char *filename) * @param filename a file path * @returns the catalog parsed or NULL in case of error */ -xmlCatalogPtr +xmlCatalog * xmlLoadACatalog(const char *filename) { xmlChar *content; @@ -2679,7 +2679,7 @@ xmlExpandCatalog(xmlCatalogPtr catal, const char *filename) * must be freed by the caller. */ xmlChar * -xmlACatalogResolveSystem(xmlCatalogPtr catal, const xmlChar *sysID) { +xmlACatalogResolveSystem(xmlCatalog *catal, const xmlChar *sysID) { xmlChar *ret = NULL; if ((sysID == NULL) || (catal == NULL)) @@ -2712,7 +2712,7 @@ xmlACatalogResolveSystem(xmlCatalogPtr catal, const xmlChar *sysID) { * must be freed by the caller. */ xmlChar * -xmlACatalogResolvePublic(xmlCatalogPtr catal, const xmlChar *pubID) { +xmlACatalogResolvePublic(xmlCatalog *catal, const xmlChar *pubID) { xmlChar *ret = NULL; if ((pubID == NULL) || (catal == NULL)) @@ -2746,7 +2746,7 @@ xmlACatalogResolvePublic(xmlCatalogPtr catal, const xmlChar *pubID) { * by the caller. */ xmlChar * -xmlACatalogResolve(xmlCatalogPtr catal, const xmlChar * pubID, +xmlACatalogResolve(xmlCatalog *catal, const xmlChar * pubID, const xmlChar * sysID) { xmlChar *ret = NULL; @@ -2790,7 +2790,7 @@ xmlACatalogResolve(xmlCatalogPtr catal, const xmlChar * pubID, * by the caller. */ xmlChar * -xmlACatalogResolveURI(xmlCatalogPtr catal, const xmlChar *URI) { +xmlACatalogResolveURI(xmlCatalog *catal, const xmlChar *URI) { xmlChar *ret = NULL; if ((URI == NULL) || (catal == NULL)) @@ -2822,7 +2822,7 @@ xmlACatalogResolveURI(xmlCatalogPtr catal, const xmlChar *URI) { * @param out the file. */ void -xmlACatalogDump(xmlCatalogPtr catal, FILE *out) { +xmlACatalogDump(xmlCatalog *catal, FILE *out) { if ((out == NULL) || (catal == NULL)) return; @@ -2845,7 +2845,7 @@ xmlACatalogDump(xmlCatalogPtr catal, FILE *out) { * @returns 0 if successful, -1 otherwise */ int -xmlACatalogAdd(xmlCatalogPtr catal, const xmlChar * type, +xmlACatalogAdd(xmlCatalog *catal, const xmlChar * type, const xmlChar * orig, const xmlChar * replace) { int res = -1; @@ -2882,7 +2882,7 @@ xmlACatalogAdd(xmlCatalogPtr catal, const xmlChar * type, * @returns the number of entries removed if successful, -1 otherwise */ int -xmlACatalogRemove(xmlCatalogPtr catal, const xmlChar *value) { +xmlACatalogRemove(xmlCatalog *catal, const xmlChar *value) { int res = -1; if ((catal == NULL) || (value == NULL)) @@ -2904,7 +2904,7 @@ xmlACatalogRemove(xmlCatalogPtr catal, const xmlChar *value) { * @param sgml should this create an SGML catalog * @returns the xmlCatalogPtr or NULL in case of error */ -xmlCatalogPtr +xmlCatalog * xmlNewCatalog(int sgml) { xmlCatalogPtr catal = NULL; @@ -2926,7 +2926,7 @@ xmlNewCatalog(int sgml) { * @returns 1 if the catalog is empty, 0 if not, amd -1 in case of error. */ int -xmlCatalogIsEmpty(xmlCatalogPtr catal) { +xmlCatalogIsEmpty(xmlCatalog *catal) { if (catal == NULL) return(-1); diff --git a/debugXML.c b/debugXML.c index 94cb62b3..7992b644 100644 --- a/debugXML.c +++ b/debugXML.c @@ -1325,7 +1325,7 @@ xmlDebugDumpString(FILE * output, const xmlChar * str) * @param depth the indentation level. */ void -xmlDebugDumpAttr(FILE *output, xmlAttrPtr attr, int depth) { +xmlDebugDumpAttr(FILE *output, xmlAttr *attr, int depth) { xmlDebugCtxt ctxt; if (output == NULL) return; @@ -1344,7 +1344,7 @@ xmlDebugDumpAttr(FILE *output, xmlAttrPtr attr, int depth) { * @param doc the document */ void -xmlDebugDumpEntities(FILE * output, xmlDocPtr doc) +xmlDebugDumpEntities(FILE * output, xmlDoc *doc) { xmlDebugCtxt ctxt; @@ -1363,7 +1363,7 @@ xmlDebugDumpEntities(FILE * output, xmlDocPtr doc) * @param depth the indentation level. */ void -xmlDebugDumpAttrList(FILE * output, xmlAttrPtr attr, int depth) +xmlDebugDumpAttrList(FILE * output, xmlAttr *attr, int depth) { xmlDebugCtxt ctxt; @@ -1383,7 +1383,7 @@ xmlDebugDumpAttrList(FILE * output, xmlAttrPtr attr, int depth) * @param depth the indentation level. */ void -xmlDebugDumpOneNode(FILE * output, xmlNodePtr node, int depth) +xmlDebugDumpOneNode(FILE * output, xmlNode *node, int depth) { xmlDebugCtxt ctxt; @@ -1403,7 +1403,7 @@ xmlDebugDumpOneNode(FILE * output, xmlNodePtr node, int depth) * @param depth the indentation level. */ void -xmlDebugDumpNode(FILE * output, xmlNodePtr node, int depth) +xmlDebugDumpNode(FILE * output, xmlNode *node, int depth) { xmlDebugCtxt ctxt; @@ -1424,7 +1424,7 @@ xmlDebugDumpNode(FILE * output, xmlNodePtr node, int depth) * @param depth the indentation level. */ void -xmlDebugDumpNodeList(FILE * output, xmlNodePtr node, int depth) +xmlDebugDumpNodeList(FILE * output, xmlNode *node, int depth) { xmlDebugCtxt ctxt; @@ -1444,7 +1444,7 @@ xmlDebugDumpNodeList(FILE * output, xmlNodePtr node, int depth) * @param doc the document */ void -xmlDebugDumpDocumentHead(FILE * output, xmlDocPtr doc) +xmlDebugDumpDocumentHead(FILE * output, xmlDoc *doc) { xmlDebugCtxt ctxt; @@ -1464,7 +1464,7 @@ xmlDebugDumpDocumentHead(FILE * output, xmlDocPtr doc) * @param doc the document */ void -xmlDebugDumpDocument(FILE * output, xmlDocPtr doc) +xmlDebugDumpDocument(FILE * output, xmlDoc *doc) { xmlDebugCtxt ctxt; @@ -1484,7 +1484,7 @@ xmlDebugDumpDocument(FILE * output, xmlDocPtr doc) * @param dtd the DTD */ void -xmlDebugDumpDTD(FILE * output, xmlDtdPtr dtd) +xmlDebugDumpDTD(FILE * output, xmlDtd *dtd) { xmlDebugCtxt ctxt; @@ -1512,7 +1512,7 @@ xmlDebugDumpDTD(FILE * output, xmlDtdPtr dtd) * @returns the number of errors found */ int -xmlDebugCheckDocument(FILE * output, xmlDocPtr doc) +xmlDebugCheckDocument(FILE * output, xmlDoc *doc) { xmlDebugCtxt ctxt; diff --git a/dict.c b/dict.c index 9daae58c..1529271e 100644 --- a/dict.c +++ b/dict.c @@ -249,7 +249,7 @@ found_pool: * * @returns the newly created dictionary, or NULL if an error occurred. */ -xmlDictPtr +xmlDict * xmlDictCreate(void) { xmlDictPtr dict; @@ -282,8 +282,8 @@ xmlDictCreate(void) { * @param sub an existing dictionary * @returns the newly created dictionary, or NULL if an error occurred. */ -xmlDictPtr -xmlDictCreateSub(xmlDictPtr sub) { +xmlDict * +xmlDictCreateSub(xmlDict *sub) { xmlDictPtr dict = xmlDictCreate(); if ((dict != NULL) && (sub != NULL)) { @@ -301,7 +301,7 @@ xmlDictCreateSub(xmlDictPtr sub) { * @returns 0 in case of success and -1 in case of error */ int -xmlDictReference(xmlDictPtr dict) { +xmlDictReference(xmlDict *dict) { if (dict == NULL) return -1; xmlMutexLock(&xmlDictMutex); dict->ref_counter++; @@ -316,7 +316,7 @@ xmlDictReference(xmlDictPtr dict) { * @param dict the dictionary */ void -xmlDictFree(xmlDictPtr dict) { +xmlDictFree(xmlDict *dict) { xmlDictStringsPtr pool, nextp; if (dict == NULL) @@ -357,7 +357,7 @@ xmlDictFree(xmlDictPtr dict) { * -1 in case of error */ int -xmlDictOwns(xmlDictPtr dict, const xmlChar *str) { +xmlDictOwns(xmlDict *dict, const xmlChar *str) { xmlDictStringsPtr pool; if ((dict == NULL) || (str == NULL)) @@ -381,7 +381,7 @@ xmlDictOwns(xmlDictPtr dict, const xmlChar *str) { * -1 in case of error */ int -xmlDictSize(xmlDictPtr dict) { +xmlDictSize(xmlDict *dict) { if (dict == NULL) return(-1); if (dict->subdict) @@ -398,7 +398,7 @@ xmlDictSize(xmlDictPtr dict) { * @returns the previous limit of the dictionary or 0 */ size_t -xmlDictSetLimit(xmlDictPtr dict, size_t limit) { +xmlDictSetLimit(xmlDict *dict, size_t limit) { size_t ret; if (dict == NULL) @@ -416,7 +416,7 @@ xmlDictSetLimit(xmlDictPtr dict, size_t limit) { * @returns the amount of strings allocated */ size_t -xmlDictGetUsage(xmlDictPtr dict) { +xmlDictGetUsage(xmlDict *dict) { xmlDictStringsPtr pool; size_t limit = 0; @@ -663,7 +663,7 @@ done: */ ATTRIBUTE_NO_SANITIZE_INTEGER static const xmlDictEntry * -xmlDictLookupInternal(xmlDictPtr dict, const xmlChar *prefix, +xmlDictLookupInternal(xmlDict *dict, const xmlChar *prefix, const xmlChar *name, int maybeLen, int update) { xmlDictEntry *entry = NULL; const xmlChar *ret; @@ -811,7 +811,7 @@ xmlDictLookupInternal(xmlDictPtr dict, const xmlChar *prefix, * failed. */ const xmlChar * -xmlDictLookup(xmlDictPtr dict, const xmlChar *name, int len) { +xmlDictLookup(xmlDict *dict, const xmlChar *name, int len) { const xmlDictEntry *entry; entry = xmlDictLookupInternal(dict, NULL, name, len, 1); @@ -830,7 +830,7 @@ xmlDictLookup(xmlDictPtr dict, const xmlChar *name, int len) { * @returns the dictionary entry. */ xmlHashedString -xmlDictLookupHashed(xmlDictPtr dict, const xmlChar *name, int len) { +xmlDictLookupHashed(xmlDict *dict, const xmlChar *name, int len) { const xmlDictEntry *entry; xmlHashedString ret; @@ -855,7 +855,7 @@ xmlDictLookupHashed(xmlDictPtr dict, const xmlChar *name, int len) { * @returns the internal copy of the name or NULL if not found. */ const xmlChar * -xmlDictExists(xmlDictPtr dict, const xmlChar *name, int len) { +xmlDictExists(xmlDict *dict, const xmlChar *name, int len) { const xmlDictEntry *entry; entry = xmlDictLookupInternal(dict, NULL, name, len, 0); @@ -875,7 +875,7 @@ xmlDictExists(xmlDictPtr dict, const xmlChar *name, int len) { * failed. */ const xmlChar * -xmlDictQLookup(xmlDictPtr dict, const xmlChar *prefix, const xmlChar *name) { +xmlDictQLookup(xmlDict *dict, const xmlChar *prefix, const xmlChar *name) { const xmlDictEntry *entry; entry = xmlDictLookupInternal(dict, prefix, name, -1, 1); diff --git a/encoding.c b/encoding.c index 3a527ffb..a4c7b9f5 100644 --- a/encoding.c +++ b/encoding.c @@ -697,7 +697,7 @@ xmlGetCharEncodingName(xmlCharEncoding enc) { * @param output the xmlCharEncodingOutputFunc to write that encoding * @returns the xmlCharEncodingHandlerPtr created (or NULL in case of error). */ -xmlCharEncodingHandlerPtr +xmlCharEncodingHandler * xmlNewCharEncodingHandler(const char *name, xmlCharEncodingInputFunc input, xmlCharEncodingOutputFunc output) { @@ -867,7 +867,7 @@ xmlCleanupCharEncodingHandlers(void) { * @param handler the xmlCharEncodingHandlerPtr handler block */ void -xmlRegisterCharEncodingHandler(xmlCharEncodingHandlerPtr handler) { +xmlRegisterCharEncodingHandler(xmlCharEncodingHandler *handler) { if (handler == NULL) return; if (globalHandlers == NULL) { @@ -983,7 +983,7 @@ xmlFindExtraHandler(const char *norig, const char *name, xmlCharEncFlags flags, */ xmlParserErrors xmlLookupCharEncodingHandler(xmlCharEncoding enc, - xmlCharEncodingHandlerPtr *out) { + xmlCharEncodingHandler **out) { const xmlCharEncodingHandler *handler; if (out == NULL) @@ -1025,7 +1025,7 @@ xmlLookupCharEncodingHandler(xmlCharEncoding enc, * @returns the handler or NULL if no handler was found or an error * occurred. */ -xmlCharEncodingHandlerPtr +xmlCharEncodingHandler * xmlGetCharEncodingHandler(xmlCharEncoding enc) { xmlCharEncodingHandler *ret; @@ -1063,7 +1063,7 @@ xmlGetCharEncodingHandler(xmlCharEncoding enc) { xmlParserErrors xmlCreateCharEncodingHandler(const char *name, xmlCharEncFlags flags, xmlCharEncConvImpl impl, void *implCtxt, - xmlCharEncodingHandlerPtr *out) { + xmlCharEncodingHandler **out) { const xmlCharEncodingHandler *handler; const char *norig, *nalias; xmlCharEncoding enc; @@ -1166,7 +1166,7 @@ xmlCreateCharEncodingHandler(const char *name, xmlCharEncFlags flags, */ xmlParserErrors xmlOpenCharEncodingHandler(const char *name, int output, - xmlCharEncodingHandlerPtr *out) { + xmlCharEncodingHandler **out) { xmlCharEncFlags flags = output ? XML_ENC_OUTPUT : XML_ENC_INPUT; return(xmlCreateCharEncodingHandler(name, flags, NULL, NULL, out)); @@ -1183,7 +1183,7 @@ xmlOpenCharEncodingHandler(const char *name, int output, * @returns the handler or NULL if no handler was found or an error * occurred. */ -xmlCharEncodingHandlerPtr +xmlCharEncodingHandler * xmlFindCharEncodingHandler(const char *name) { xmlCharEncodingHandler *ret; xmlCharEncFlags flags; @@ -1790,7 +1790,7 @@ xmlCharEncFirstLine(xmlCharEncodingHandler *handler, struct _xmlBuffer *out, * @returns an xmlCharEncError code. */ xmlCharEncError -xmlCharEncInput(xmlParserInputBufferPtr input, size_t *sizeOut, int flush) +xmlCharEncInput(xmlParserInputBuffer *input, size_t *sizeOut, int flush) { xmlBufPtr out, in; const xmlChar *dataIn; @@ -1973,7 +1973,7 @@ xmlSerializeDecCharRef(char *buf, int val) { * @returns the number of bytes written or an xmlCharEncError code. */ int -xmlCharEncOutput(xmlOutputBufferPtr output, int init) +xmlCharEncOutput(xmlOutputBuffer *output, int init) { int ret; size_t written; @@ -2219,7 +2219,7 @@ xmlCharEncCloseFunc(xmlCharEncodingHandler *handler) { * in case the index could not be computed. */ long -xmlByteConsumed(xmlParserCtxtPtr ctxt) { +xmlByteConsumed(xmlParserCtxt *ctxt) { xmlParserInputPtr in; if (ctxt == NULL) diff --git a/entities.c b/entities.c index 503072cc..cbc8cb30 100644 --- a/entities.c +++ b/entities.c @@ -80,7 +80,7 @@ static xmlEntity xmlEntityApos = { * @param entity an entity */ void -xmlFreeEntity(xmlEntityPtr entity) +xmlFreeEntity(xmlEntity *entity) { xmlDictPtr dict = NULL; @@ -182,9 +182,9 @@ error: * @returns an xmlParserErrors error code. */ int -xmlAddEntity(xmlDocPtr doc, int extSubset, const xmlChar *name, int type, +xmlAddEntity(xmlDoc *doc, int extSubset, const xmlChar *name, int type, const xmlChar *ExternalID, const xmlChar *SystemID, - const xmlChar *content, xmlEntityPtr *out) { + const xmlChar *content, xmlEntity **out) { xmlDtdPtr dtd; xmlDictPtr dict = NULL; xmlEntitiesTablePtr table = NULL; @@ -301,7 +301,7 @@ xmlAddEntity(xmlDocPtr doc, int extSubset, const xmlChar *name, int type, * @param name the entity name * @returns the entity, or NULL if not found. */ -xmlEntityPtr +xmlEntity * xmlGetPredefinedEntity(const xmlChar *name) { if (name == NULL) return(NULL); switch (name[0]) { @@ -342,8 +342,8 @@ xmlGetPredefinedEntity(const xmlChar *name) { * @param content the entity content * @returns a pointer to the entity or NULL in case of error */ -xmlEntityPtr -xmlAddDtdEntity(xmlDocPtr doc, const xmlChar *name, int type, +xmlEntity * +xmlAddDtdEntity(xmlDoc *doc, const xmlChar *name, int type, const xmlChar *ExternalID, const xmlChar *SystemID, const xmlChar *content) { xmlEntityPtr ret; @@ -365,8 +365,8 @@ xmlAddDtdEntity(xmlDocPtr doc, const xmlChar *name, int type, * @param content the entity content * @returns a pointer to the entity or NULL in case of error */ -xmlEntityPtr -xmlAddDocEntity(xmlDocPtr doc, const xmlChar *name, int type, +xmlEntity * +xmlAddDocEntity(xmlDoc *doc, const xmlChar *name, int type, const xmlChar *ExternalID, const xmlChar *SystemID, const xmlChar *content) { xmlEntityPtr ret; @@ -391,8 +391,8 @@ xmlAddDocEntity(xmlDocPtr doc, const xmlChar *name, int type, * @param content the entity content * @returns a pointer to the entity or NULL in case of error */ -xmlEntityPtr -xmlNewEntity(xmlDocPtr doc, const xmlChar *name, int type, +xmlEntity * +xmlNewEntity(xmlDoc *doc, const xmlChar *name, int type, const xmlChar *ExternalID, const xmlChar *SystemID, const xmlChar *content) { if ((doc != NULL) && (doc->intSubset != NULL)) { @@ -423,8 +423,8 @@ xmlGetEntityFromTable(xmlEntitiesTablePtr table, const xmlChar *name) { * @param name the entity name * @returns a pointer to the entity or NULL if not found. */ -xmlEntityPtr -xmlGetParameterEntity(xmlDocPtr doc, const xmlChar *name) { +xmlEntity * +xmlGetParameterEntity(xmlDoc *doc, const xmlChar *name) { xmlEntitiesTablePtr table; xmlEntityPtr ret; @@ -450,8 +450,8 @@ xmlGetParameterEntity(xmlDocPtr doc, const xmlChar *name) { * @param name the entity name * @returns a pointer to the entity or NULL if not found. */ -xmlEntityPtr -xmlGetDtdEntity(xmlDocPtr doc, const xmlChar *name) { +xmlEntity * +xmlGetDtdEntity(xmlDoc *doc, const xmlChar *name) { xmlEntitiesTablePtr table; if (doc == NULL) @@ -471,7 +471,7 @@ xmlGetDtdEntity(xmlDocPtr doc, const xmlChar *name) { * @param name the entity name * @returns a pointer to the entity or NULL if not found. */ -xmlEntityPtr +xmlEntity * xmlGetDocEntity(const xmlDoc *doc, const xmlChar *name) { xmlEntityPtr cur; xmlEntitiesTablePtr table; @@ -518,7 +518,7 @@ xmlGetDocEntity(const xmlDoc *doc, const xmlChar *name) { * @returns a newly allocated string with substitutions. */ xmlChar * -xmlEncodeEntitiesReentrant(xmlDocPtr doc, const xmlChar *input) { +xmlEncodeEntitiesReentrant(xmlDoc *doc, const xmlChar *input) { int flags = 0; if (input == NULL) @@ -557,7 +557,7 @@ xmlEncodeSpecialChars(const xmlDoc *doc ATTRIBUTE_UNUSED, * * @returns the xmlEntitiesTablePtr just created or NULL in case of error. */ -xmlEntitiesTablePtr +xmlEntitiesTable * xmlCreateEntitiesTable(void) { return((xmlEntitiesTablePtr) xmlHashCreate(0)); } @@ -580,7 +580,7 @@ xmlFreeEntityWrapper(void *entity, const xmlChar *name ATTRIBUTE_UNUSED) { * @param table An entity table */ void -xmlFreeEntitiesTable(xmlEntitiesTablePtr table) { +xmlFreeEntitiesTable(xmlEntitiesTable *table) { xmlHashFree(table, xmlFreeEntityWrapper); } @@ -646,8 +646,8 @@ error: * @param table An entity table * @returns the new xmlEntitiesTablePtr or NULL in case of error. */ -xmlEntitiesTablePtr -xmlCopyEntitiesTable(xmlEntitiesTablePtr table) { +xmlEntitiesTable * +xmlCopyEntitiesTable(xmlEntitiesTable *table) { return(xmlHashCopySafe(table, xmlCopyEntity, xmlFreeEntityWrapper)); } @@ -661,7 +661,7 @@ xmlCopyEntitiesTable(xmlEntitiesTablePtr table) { * @param ent An entity table */ void -xmlDumpEntityDecl(xmlBufferPtr buf, xmlEntityPtr ent) { +xmlDumpEntityDecl(xmlBuffer *buf, xmlEntity *ent) { xmlSaveCtxtPtr save; if ((buf == NULL) || (ent == NULL)) @@ -695,7 +695,7 @@ xmlDumpEntityDeclScan(void *ent, void *save, * @param table An entity table */ void -xmlDumpEntitiesTable(xmlBufferPtr buf, xmlEntitiesTablePtr table) { +xmlDumpEntitiesTable(xmlBuffer *buf, xmlEntitiesTable *table) { xmlSaveCtxtPtr save; if ((buf == NULL) || (table == NULL)) diff --git a/error.c b/error.c index 5332b8cc..e6cfa342 100644 --- a/error.c +++ b/error.c @@ -967,7 +967,7 @@ xmlGetLastError(void) * @param err pointer to the error */ void -xmlResetError(xmlErrorPtr err) +xmlResetError(xmlError *err) { if (err == NULL) return; @@ -1007,7 +1007,7 @@ xmlResetLastError(void) * @returns 0 in case of success and -1 in case of error. */ int -xmlCopyError(const xmlError *from, xmlErrorPtr to) { +xmlCopyError(const xmlError *from, xmlError *to) { const char *fmt = NULL; if ((from == NULL) || (to == NULL)) diff --git a/hash.c b/hash.c index c17019ae..f21c00b2 100644 --- a/hash.c +++ b/hash.c @@ -154,7 +154,7 @@ xmlHashQNameValue(unsigned seed, * @param size initial size of the hash table * @returns the newly created object, or NULL if a memory allocation failed. */ -xmlHashTablePtr +xmlHashTable * xmlHashCreate(int size) { xmlHashTablePtr hash; @@ -201,8 +201,8 @@ xmlHashCreate(int size) { * @param dict a dictionary to use for the hash * @returns the newly created object, or NULL if a memory allocation failed. */ -xmlHashTablePtr -xmlHashCreateDict(int size, xmlDictPtr dict) { +xmlHashTable * +xmlHashCreateDict(int size, xmlDict *dict) { xmlHashTablePtr hash; hash = xmlHashCreate(size); @@ -221,7 +221,7 @@ xmlHashCreateDict(int size, xmlDictPtr dict) { * @param dealloc deallocator function or NULL */ void -xmlHashFree(xmlHashTablePtr hash, xmlHashDeallocator dealloc) { +xmlHashFree(xmlHashTable *hash, xmlHashDeallocator dealloc) { if (hash == NULL) return; @@ -412,7 +412,7 @@ done: */ ATTRIBUTE_NO_SANITIZE_INTEGER static int -xmlHashUpdateInternal(xmlHashTablePtr hash, const xmlChar *key, +xmlHashUpdateInternal(xmlHashTable *hash, const xmlChar *key, const xmlChar *key2, const xmlChar *key3, void *payload, xmlHashDeallocator dealloc, int update) { xmlChar *copy, *copy2, *copy3; @@ -607,7 +607,7 @@ xmlHashDefaultDeallocator(void *entry, const xmlChar *key ATTRIBUTE_UNUSED) { * @returns 1 on success, 0 if an entry exists and -1 in case of error. */ int -xmlHashAdd(xmlHashTablePtr hash, const xmlChar *key, void *payload) { +xmlHashAdd(xmlHashTable *hash, const xmlChar *key, void *payload) { return(xmlHashUpdateInternal(hash, key, NULL, NULL, payload, NULL, 0)); } @@ -625,7 +625,7 @@ xmlHashAdd(xmlHashTablePtr hash, const xmlChar *key, void *payload) { * @returns 1 on success, 0 if an entry exists and -1 in case of error. */ int -xmlHashAdd2(xmlHashTablePtr hash, const xmlChar *key, +xmlHashAdd2(xmlHashTable *hash, const xmlChar *key, const xmlChar *key2, void *payload) { return(xmlHashUpdateInternal(hash, key, key2, NULL, payload, NULL, 0)); } @@ -645,7 +645,7 @@ xmlHashAdd2(xmlHashTablePtr hash, const xmlChar *key, * @returns 1 on success, 0 if an entry exists and -1 in case of error. */ int -xmlHashAdd3(xmlHashTablePtr hash, const xmlChar *key, +xmlHashAdd3(xmlHashTable *hash, const xmlChar *key, const xmlChar *key2, const xmlChar *key3, void *payload) { return(xmlHashUpdateInternal(hash, key, key2, key3, payload, NULL, 0)); @@ -666,7 +666,7 @@ xmlHashAdd3(xmlHashTablePtr hash, const xmlChar *key, * @returns 0 on success and -1 in case of error. */ int -xmlHashAddEntry(xmlHashTablePtr hash, const xmlChar *key, void *payload) { +xmlHashAddEntry(xmlHashTable *hash, const xmlChar *key, void *payload) { int res = xmlHashUpdateInternal(hash, key, NULL, NULL, payload, NULL, 0); if (res == 0) @@ -689,7 +689,7 @@ xmlHashAddEntry(xmlHashTablePtr hash, const xmlChar *key, void *payload) { * @returns 0 on success and -1 in case of error. */ int -xmlHashAddEntry2(xmlHashTablePtr hash, const xmlChar *key, +xmlHashAddEntry2(xmlHashTable *hash, const xmlChar *key, const xmlChar *key2, void *payload) { int res = xmlHashUpdateInternal(hash, key, key2, NULL, payload, NULL, 0); @@ -714,7 +714,7 @@ xmlHashAddEntry2(xmlHashTablePtr hash, const xmlChar *key, * @returns 0 on success and -1 in case of error. */ int -xmlHashAddEntry3(xmlHashTablePtr hash, const xmlChar *key, +xmlHashAddEntry3(xmlHashTable *hash, const xmlChar *key, const xmlChar *key2, const xmlChar *key3, void *payload) { int res = xmlHashUpdateInternal(hash, key, key2, key3, payload, NULL, 0); @@ -738,7 +738,7 @@ xmlHashAddEntry3(xmlHashTablePtr hash, const xmlChar *key, * @returns 0 in case of success, -1 if a memory allocation failed. */ int -xmlHashUpdateEntry(xmlHashTablePtr hash, const xmlChar *key, +xmlHashUpdateEntry(xmlHashTable *hash, const xmlChar *key, void *payload, xmlHashDeallocator dealloc) { int res = xmlHashUpdateInternal(hash, key, NULL, NULL, payload, dealloc, 1); @@ -762,7 +762,7 @@ xmlHashUpdateEntry(xmlHashTablePtr hash, const xmlChar *key, * @returns 0 on success and -1 in case of error. */ int -xmlHashUpdateEntry2(xmlHashTablePtr hash, const xmlChar *key, +xmlHashUpdateEntry2(xmlHashTable *hash, const xmlChar *key, const xmlChar *key2, void *payload, xmlHashDeallocator dealloc) { int res = xmlHashUpdateInternal(hash, key, key2, NULL, payload, @@ -788,7 +788,7 @@ xmlHashUpdateEntry2(xmlHashTablePtr hash, const xmlChar *key, * @returns 0 on success and -1 in case of error. */ int -xmlHashUpdateEntry3(xmlHashTablePtr hash, const xmlChar *key, +xmlHashUpdateEntry3(xmlHashTable *hash, const xmlChar *key, const xmlChar *key2, const xmlChar *key3, void *payload, xmlHashDeallocator dealloc) { int res = xmlHashUpdateInternal(hash, key, key2, key3, payload, @@ -808,7 +808,7 @@ xmlHashUpdateEntry3(xmlHashTablePtr hash, const xmlChar *key, * @returns a pointer to the payload or NULL if no entry was found. */ void * -xmlHashLookup(xmlHashTablePtr hash, const xmlChar *key) { +xmlHashLookup(xmlHashTable *hash, const xmlChar *key) { return(xmlHashLookup3(hash, key, NULL, NULL)); } @@ -821,7 +821,7 @@ xmlHashLookup(xmlHashTablePtr hash, const xmlChar *key) { * @returns a pointer to the payload or NULL if no entry was found. */ void * -xmlHashLookup2(xmlHashTablePtr hash, const xmlChar *key, +xmlHashLookup2(xmlHashTable *hash, const xmlChar *key, const xmlChar *key2) { return(xmlHashLookup3(hash, key, key2, NULL)); } @@ -835,7 +835,7 @@ xmlHashLookup2(xmlHashTablePtr hash, const xmlChar *key, * @returns a pointer to the payload or NULL if no entry was found. */ void * -xmlHashQLookup(xmlHashTablePtr hash, const xmlChar *prefix, +xmlHashQLookup(xmlHashTable *hash, const xmlChar *prefix, const xmlChar *name) { return(xmlHashQLookup3(hash, prefix, name, NULL, NULL, NULL, NULL)); } @@ -851,7 +851,7 @@ xmlHashQLookup(xmlHashTablePtr hash, const xmlChar *prefix, * @returns a pointer to the payload or NULL if no entry was found. */ void * -xmlHashQLookup2(xmlHashTablePtr hash, const xmlChar *prefix, +xmlHashQLookup2(xmlHashTable *hash, const xmlChar *prefix, const xmlChar *name, const xmlChar *prefix2, const xmlChar *name2) { return(xmlHashQLookup3(hash, prefix, name, prefix2, name2, NULL, NULL)); @@ -867,7 +867,7 @@ xmlHashQLookup2(xmlHashTablePtr hash, const xmlChar *prefix, * @returns a pointer to the payload or NULL if no entry was found. */ void * -xmlHashLookup3(xmlHashTablePtr hash, const xmlChar *key, +xmlHashLookup3(xmlHashTable *hash, const xmlChar *key, const xmlChar *key2, const xmlChar *key3) { const xmlHashEntry *entry; unsigned hashValue; @@ -896,7 +896,7 @@ xmlHashLookup3(xmlHashTablePtr hash, const xmlChar *key, */ ATTRIBUTE_NO_SANITIZE_INTEGER void * -xmlHashQLookup3(xmlHashTablePtr hash, +xmlHashQLookup3(xmlHashTable *hash, const xmlChar *prefix, const xmlChar *name, const xmlChar *prefix2, const xmlChar *name2, const xmlChar *prefix3, const xmlChar *name3) { @@ -956,7 +956,7 @@ stubHashScannerFull(void *payload, void *data, const xmlChar *key, * @param data extra data passed to `scan` */ void -xmlHashScan(xmlHashTablePtr hash, xmlHashScanner scan, void *data) { +xmlHashScan(xmlHashTable *hash, xmlHashScanner scan, void *data) { stubData sdata; sdata.data = data; sdata.scan = scan; @@ -971,7 +971,7 @@ xmlHashScan(xmlHashTablePtr hash, xmlHashScanner scan, void *data) { * @param data extra data passed to `scan` */ void -xmlHashScanFull(xmlHashTablePtr hash, xmlHashScannerFull scan, void *data) { +xmlHashScanFull(xmlHashTable *hash, xmlHashScannerFull scan, void *data) { const xmlHashEntry *entry, *end; xmlHashEntry old; unsigned i; @@ -1025,7 +1025,7 @@ xmlHashScanFull(xmlHashTablePtr hash, xmlHashScannerFull scan, void *data) { * @param data extra data passed to `scan` */ void -xmlHashScan3(xmlHashTablePtr hash, const xmlChar *key, +xmlHashScan3(xmlHashTable *hash, const xmlChar *key, const xmlChar *key2, const xmlChar *key3, xmlHashScanner scan, void *data) { stubData sdata; @@ -1047,7 +1047,7 @@ xmlHashScan3(xmlHashTablePtr hash, const xmlChar *key, * @param data extra data passed to `scan` */ void -xmlHashScanFull3(xmlHashTablePtr hash, const xmlChar *key, +xmlHashScanFull3(xmlHashTable *hash, const xmlChar *key, const xmlChar *key2, const xmlChar *key3, xmlHashScannerFull scan, void *data) { const xmlHashEntry *entry, *end; @@ -1106,8 +1106,8 @@ xmlHashScanFull3(xmlHashTablePtr hash, const xmlChar *key, * * @returns the new table or NULL if a memory allocation failed. */ -xmlHashTablePtr -xmlHashCopySafe(xmlHashTablePtr hash, xmlHashCopier copyFunc, +xmlHashTable * +xmlHashCopySafe(xmlHashTable *hash, xmlHashCopier copyFunc, xmlHashDeallocator deallocFunc) { const xmlHashEntry *entry, *end; xmlHashTablePtr ret; @@ -1157,8 +1157,8 @@ error: * * @returns the new table or NULL if a memory allocation failed. */ -xmlHashTablePtr -xmlHashCopy(xmlHashTablePtr hash, xmlHashCopier copy) { +xmlHashTable * +xmlHashCopy(xmlHashTable *hash, xmlHashCopier copy) { return(xmlHashCopySafe(hash, copy, NULL)); } @@ -1170,7 +1170,7 @@ xmlHashCopy(xmlHashTablePtr hash, xmlHashCopier copy) { * -1 in case of error. */ int -xmlHashSize(xmlHashTablePtr hash) { +xmlHashSize(xmlHashTable *hash) { if (hash == NULL) return(-1); return(hash->nbElems); @@ -1185,7 +1185,7 @@ xmlHashSize(xmlHashTablePtr hash) { * @param dealloc deallocator function for removed item or NULL * @returns 0 on success and -1 if no entry was found. */ -int xmlHashRemoveEntry(xmlHashTablePtr hash, const xmlChar *key, +int xmlHashRemoveEntry(xmlHashTable *hash, const xmlChar *key, xmlHashDeallocator dealloc) { return(xmlHashRemoveEntry3(hash, key, NULL, NULL, dealloc)); } @@ -1202,7 +1202,7 @@ int xmlHashRemoveEntry(xmlHashTablePtr hash, const xmlChar *key, * @returns 0 on success and -1 in case of error. */ int -xmlHashRemoveEntry2(xmlHashTablePtr hash, const xmlChar *key, +xmlHashRemoveEntry2(xmlHashTable *hash, const xmlChar *key, const xmlChar *key2, xmlHashDeallocator dealloc) { return(xmlHashRemoveEntry3(hash, key, key2, NULL, dealloc)); } @@ -1221,7 +1221,7 @@ xmlHashRemoveEntry2(xmlHashTablePtr hash, const xmlChar *key, */ ATTRIBUTE_NO_SANITIZE_INTEGER int -xmlHashRemoveEntry3(xmlHashTablePtr hash, const xmlChar *key, +xmlHashRemoveEntry3(xmlHashTable *hash, const xmlChar *key, const xmlChar *key2, const xmlChar *key3, xmlHashDeallocator dealloc) { xmlHashEntry *entry, *cur, *next; diff --git a/include/libxml/HTMLparser.h b/include/libxml/HTMLparser.h index 47d76dc1..f4925bd3 100644 --- a/include/libxml/HTMLparser.h +++ b/include/libxml/HTMLparser.h @@ -115,55 +115,55 @@ XMLPUBFUN const htmlEntityDesc * XML_DEPRECATED XMLPUBFUN int - htmlIsAutoClosed(htmlDocPtr doc, - htmlNodePtr elem); + htmlIsAutoClosed(xmlDoc *doc, + xmlNode *elem); XML_DEPRECATED XMLPUBFUN int - htmlAutoCloseTag(htmlDocPtr doc, + htmlAutoCloseTag(xmlDoc *doc, const xmlChar *name, - htmlNodePtr elem); + xmlNode *elem); XML_DEPRECATED XMLPUBFUN const htmlEntityDesc * - htmlParseEntityRef(htmlParserCtxtPtr ctxt, + htmlParseEntityRef(htmlParserCtxt *ctxt, const xmlChar **str); XML_DEPRECATED XMLPUBFUN int - htmlParseCharRef(htmlParserCtxtPtr ctxt); + htmlParseCharRef(htmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN void - htmlParseElement(htmlParserCtxtPtr ctxt); + htmlParseElement(htmlParserCtxt *ctxt); -XMLPUBFUN htmlParserCtxtPtr +XMLPUBFUN htmlParserCtxt * htmlNewParserCtxt(void); -XMLPUBFUN htmlParserCtxtPtr +XMLPUBFUN htmlParserCtxt * htmlNewSAXParserCtxt(const htmlSAXHandler *sax, void *userData); -XMLPUBFUN htmlParserCtxtPtr +XMLPUBFUN htmlParserCtxt * htmlCreateMemoryParserCtxt(const char *buffer, int size); XMLPUBFUN int - htmlParseDocument(htmlParserCtxtPtr ctxt); + htmlParseDocument(htmlParserCtxt *ctxt); XML_DEPRECATED -XMLPUBFUN htmlDocPtr +XMLPUBFUN xmlDoc * htmlSAXParseDoc (const xmlChar *cur, const char *encoding, - htmlSAXHandlerPtr sax, + htmlSAXHandler *sax, void *userData); -XMLPUBFUN htmlDocPtr +XMLPUBFUN xmlDoc * htmlParseDoc (const xmlChar *cur, const char *encoding); -XMLPUBFUN htmlParserCtxtPtr +XMLPUBFUN htmlParserCtxt * htmlCreateFileParserCtxt(const char *filename, const char *encoding); XML_DEPRECATED -XMLPUBFUN htmlDocPtr +XMLPUBFUN xmlDoc * htmlSAXParseFile(const char *filename, const char *encoding, - htmlSAXHandlerPtr sax, + htmlSAXHandler *sax, void *userData); -XMLPUBFUN htmlDocPtr +XMLPUBFUN xmlDoc * htmlParseFile (const char *filename, const char *encoding); XML_DEPRECATED @@ -189,22 +189,22 @@ XMLPUBFUN int /* * Interfaces for the Push mode. */ -XMLPUBFUN htmlParserCtxtPtr - htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax, +XMLPUBFUN htmlParserCtxt * + htmlCreatePushParserCtxt(htmlSAXHandler *sax, void *user_data, const char *chunk, int size, const char *filename, xmlCharEncoding enc); XMLPUBFUN int - htmlParseChunk (htmlParserCtxtPtr ctxt, + htmlParseChunk (htmlParserCtxt *ctxt, const char *chunk, int size, int terminate); #endif /* LIBXML_PUSH_ENABLED */ XMLPUBFUN void - htmlFreeParserCtxt (htmlParserCtxtPtr ctxt); + htmlFreeParserCtxt (htmlParserCtxt *ctxt); /* * New set of simpler/more flexible APIs @@ -292,69 +292,69 @@ typedef enum { } htmlParserOption; XMLPUBFUN void - htmlCtxtReset (htmlParserCtxtPtr ctxt); + htmlCtxtReset (htmlParserCtxt *ctxt); XMLPUBFUN int - htmlCtxtSetOptions (htmlParserCtxtPtr ctxt, + htmlCtxtSetOptions (htmlParserCtxt *ctxt, int options); XMLPUBFUN int - htmlCtxtUseOptions (htmlParserCtxtPtr ctxt, + htmlCtxtUseOptions (htmlParserCtxt *ctxt, int options); -XMLPUBFUN htmlDocPtr +XMLPUBFUN xmlDoc * htmlReadDoc (const xmlChar *cur, const char *URL, const char *encoding, int options); -XMLPUBFUN htmlDocPtr +XMLPUBFUN xmlDoc * htmlReadFile (const char *URL, const char *encoding, int options); -XMLPUBFUN htmlDocPtr +XMLPUBFUN xmlDoc * htmlReadMemory (const char *buffer, int size, const char *URL, const char *encoding, int options); -XMLPUBFUN htmlDocPtr +XMLPUBFUN xmlDoc * htmlReadFd (int fd, const char *URL, const char *encoding, int options); -XMLPUBFUN htmlDocPtr +XMLPUBFUN xmlDoc * htmlReadIO (xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void *ioctx, const char *URL, const char *encoding, int options); -XMLPUBFUN htmlDocPtr - htmlCtxtParseDocument (htmlParserCtxtPtr ctxt, - xmlParserInputPtr input); -XMLPUBFUN htmlDocPtr - htmlCtxtReadDoc (xmlParserCtxtPtr ctxt, +XMLPUBFUN xmlDoc * + htmlCtxtParseDocument (htmlParserCtxt *ctxt, + xmlParserInput *input); +XMLPUBFUN xmlDoc * + htmlCtxtReadDoc (xmlParserCtxt *ctxt, const xmlChar *cur, const char *URL, const char *encoding, int options); -XMLPUBFUN htmlDocPtr - htmlCtxtReadFile (xmlParserCtxtPtr ctxt, +XMLPUBFUN xmlDoc * + htmlCtxtReadFile (xmlParserCtxt *ctxt, const char *filename, const char *encoding, int options); -XMLPUBFUN htmlDocPtr - htmlCtxtReadMemory (xmlParserCtxtPtr ctxt, +XMLPUBFUN xmlDoc * + htmlCtxtReadMemory (xmlParserCtxt *ctxt, const char *buffer, int size, const char *URL, const char *encoding, int options); -XMLPUBFUN htmlDocPtr - htmlCtxtReadFd (xmlParserCtxtPtr ctxt, +XMLPUBFUN xmlDoc * + htmlCtxtReadFd (xmlParserCtxt *ctxt, int fd, const char *URL, const char *encoding, int options); -XMLPUBFUN htmlDocPtr - htmlCtxtReadIO (xmlParserCtxtPtr ctxt, +XMLPUBFUN xmlDoc * + htmlCtxtReadIO (xmlParserCtxt *ctxt, xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void *ioctx, @@ -383,7 +383,7 @@ XMLPUBFUN int htmlElementAllowedHere(const htmlElemDesc*, const xmlChar*) ; XML_DEPRECATED XMLPUBFUN htmlStatus htmlElementStatusHere(const htmlElemDesc*, const htmlElemDesc*) ; XML_DEPRECATED -XMLPUBFUN htmlStatus htmlNodeStatus(htmlNodePtr, int) ; +XMLPUBFUN htmlStatus htmlNodeStatus(xmlNode *, int) ; #ifdef __cplusplus } diff --git a/include/libxml/HTMLtree.h b/include/libxml/HTMLtree.h index f91400aa..042f45e5 100644 --- a/include/libxml/HTMLtree.h +++ b/include/libxml/HTMLtree.h @@ -34,75 +34,75 @@ extern "C" { #define HTML_PI_NODE XML_PI_NODE /** @endcond */ -XMLPUBFUN htmlDocPtr +XMLPUBFUN xmlDoc * htmlNewDoc (const xmlChar *URI, const xmlChar *ExternalID); -XMLPUBFUN htmlDocPtr +XMLPUBFUN xmlDoc * htmlNewDocNoDtD (const xmlChar *URI, const xmlChar *ExternalID); XMLPUBFUN const xmlChar * - htmlGetMetaEncoding (htmlDocPtr doc); + htmlGetMetaEncoding (xmlDoc *doc); XMLPUBFUN int - htmlSetMetaEncoding (htmlDocPtr doc, + htmlSetMetaEncoding (xmlDoc *doc, const xmlChar *encoding); #ifdef LIBXML_OUTPUT_ENABLED XMLPUBFUN void - htmlDocDumpMemory (xmlDocPtr cur, + htmlDocDumpMemory (xmlDoc *cur, xmlChar **mem, int *size); XMLPUBFUN void - htmlDocDumpMemoryFormat (xmlDocPtr cur, + htmlDocDumpMemoryFormat (xmlDoc *cur, xmlChar **mem, int *size, int format); XMLPUBFUN int htmlSaveFile (const char *filename, - xmlDocPtr cur); + xmlDoc *cur); XMLPUBFUN int htmlSaveFileEnc (const char *filename, - xmlDocPtr cur, + xmlDoc *cur, const char *encoding); XMLPUBFUN int htmlSaveFileFormat (const char *filename, - xmlDocPtr cur, + xmlDoc *cur, const char *encoding, int format); XMLPUBFUN int - htmlNodeDump (xmlBufferPtr buf, - xmlDocPtr doc, - xmlNodePtr cur); + htmlNodeDump (xmlBuffer *buf, + xmlDoc *doc, + xmlNode *cur); XMLPUBFUN int htmlDocDump (FILE *f, - xmlDocPtr cur); + xmlDoc *cur); XMLPUBFUN void htmlNodeDumpFile (FILE *out, - xmlDocPtr doc, - xmlNodePtr cur); + xmlDoc *doc, + xmlNode *cur); XMLPUBFUN int htmlNodeDumpFileFormat (FILE *out, - xmlDocPtr doc, - xmlNodePtr cur, + xmlDoc *doc, + xmlNode *cur, const char *encoding, int format); XMLPUBFUN void - htmlNodeDumpOutput (xmlOutputBufferPtr buf, - xmlDocPtr doc, - xmlNodePtr cur, + htmlNodeDumpOutput (xmlOutputBuffer *buf, + xmlDoc *doc, + xmlNode *cur, const char *encoding); XMLPUBFUN void - htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, - xmlDocPtr doc, - xmlNodePtr cur, + htmlNodeDumpFormatOutput(xmlOutputBuffer *buf, + xmlDoc *doc, + xmlNode *cur, const char *encoding, int format); XMLPUBFUN void - htmlDocContentDumpOutput(xmlOutputBufferPtr buf, - xmlDocPtr cur, + htmlDocContentDumpOutput(xmlOutputBuffer *buf, + xmlDoc *cur, const char *encoding); XMLPUBFUN void - htmlDocContentDumpFormatOutput(xmlOutputBufferPtr buf, - xmlDocPtr cur, + htmlDocContentDumpFormatOutput(xmlOutputBuffer *buf, + xmlDoc *cur, const char *encoding, int format); diff --git a/include/libxml/SAX2.h b/include/libxml/SAX2.h index 45228b3e..d0e2633d 100644 --- a/include/libxml/SAX2.h +++ b/include/libxml/SAX2.h @@ -27,7 +27,7 @@ XMLPUBFUN const xmlChar * xmlSAX2GetSystemId (void *ctx); XMLPUBFUN void xmlSAX2SetDocumentLocator (void *ctx, - xmlSAXLocatorPtr loc); + xmlSAXLocator *loc); XMLPUBFUN int xmlSAX2GetLineNumber (void *ctx); @@ -51,13 +51,13 @@ XMLPUBFUN void const xmlChar *name, const xmlChar *ExternalID, const xmlChar *SystemID); -XMLPUBFUN xmlEntityPtr +XMLPUBFUN xmlEntity * xmlSAX2GetEntity (void *ctx, const xmlChar *name); -XMLPUBFUN xmlEntityPtr +XMLPUBFUN xmlEntity * xmlSAX2GetParameterEntity (void *ctx, const xmlChar *name); -XMLPUBFUN xmlParserInputPtr +XMLPUBFUN xmlParserInput * xmlSAX2ResolveEntity (void *ctx, const xmlChar *publicId, const xmlChar *systemId); @@ -76,12 +76,12 @@ XMLPUBFUN void int type, int def, const xmlChar *defaultValue, - xmlEnumerationPtr tree); + xmlEnumeration *tree); XMLPUBFUN void xmlSAX2ElementDecl (void *ctx, const xmlChar *name, int type, - xmlElementContentPtr content); + xmlElementContent *content); XMLPUBFUN void xmlSAX2NotationDecl (void *ctx, const xmlChar *name, diff --git a/include/libxml/c14n.h b/include/libxml/c14n.h index 61d829bd..e0baabd1 100644 --- a/include/libxml/c14n.h +++ b/include/libxml/c14n.h @@ -58,24 +58,24 @@ typedef enum { } xmlC14NMode; XMLPUBFUN int - xmlC14NDocSaveTo (xmlDocPtr doc, - xmlNodeSetPtr nodes, + xmlC14NDocSaveTo (xmlDoc *doc, + xmlNodeSet *nodes, int mode, /* a xmlC14NMode */ xmlChar **inclusive_ns_prefixes, int with_comments, - xmlOutputBufferPtr buf); + xmlOutputBuffer *buf); XMLPUBFUN int - xmlC14NDocDumpMemory (xmlDocPtr doc, - xmlNodeSetPtr nodes, + xmlC14NDocDumpMemory (xmlDoc *doc, + xmlNodeSet *nodes, int mode, /* a xmlC14NMode */ xmlChar **inclusive_ns_prefixes, int with_comments, xmlChar **doc_txt_ptr); XMLPUBFUN int - xmlC14NDocSave (xmlDocPtr doc, - xmlNodeSetPtr nodes, + xmlC14NDocSave (xmlDoc *doc, + xmlNodeSet *nodes, int mode, /* a xmlC14NMode */ xmlChar **inclusive_ns_prefixes, int with_comments, @@ -95,17 +95,17 @@ XMLPUBFUN int * @returns 1 if the node should be included */ typedef int (*xmlC14NIsVisibleCallback) (void* user_data, - xmlNodePtr node, - xmlNodePtr parent); + xmlNode *node, + xmlNode *parent); XMLPUBFUN int - xmlC14NExecute (xmlDocPtr doc, + xmlC14NExecute (xmlDoc *doc, xmlC14NIsVisibleCallback is_visible_callback, void* user_data, int mode, /* a xmlC14NMode */ xmlChar **inclusive_ns_prefixes, int with_comments, - xmlOutputBufferPtr buf); + xmlOutputBuffer *buf); #ifdef __cplusplus } diff --git a/include/libxml/catalog.h b/include/libxml/catalog.h index 8eaa18f1..b925ab49 100644 --- a/include/libxml/catalog.h +++ b/include/libxml/catalog.h @@ -69,44 +69,44 @@ typedef xmlCatalog *xmlCatalogPtr; /* * Operations on a given catalog. */ -XMLPUBFUN xmlCatalogPtr +XMLPUBFUN xmlCatalog * xmlNewCatalog (int sgml); -XMLPUBFUN xmlCatalogPtr +XMLPUBFUN xmlCatalog * xmlLoadACatalog (const char *filename); -XMLPUBFUN xmlCatalogPtr +XMLPUBFUN xmlCatalog * xmlLoadSGMLSuperCatalog (const char *filename); XMLPUBFUN int - xmlConvertSGMLCatalog (xmlCatalogPtr catal); + xmlConvertSGMLCatalog (xmlCatalog *catal); XMLPUBFUN int - xmlACatalogAdd (xmlCatalogPtr catal, + xmlACatalogAdd (xmlCatalog *catal, const xmlChar *type, const xmlChar *orig, const xmlChar *replace); XMLPUBFUN int - xmlACatalogRemove (xmlCatalogPtr catal, + xmlACatalogRemove (xmlCatalog *catal, const xmlChar *value); XMLPUBFUN xmlChar * - xmlACatalogResolve (xmlCatalogPtr catal, + xmlACatalogResolve (xmlCatalog *catal, const xmlChar *pubID, const xmlChar *sysID); XMLPUBFUN xmlChar * - xmlACatalogResolveSystem(xmlCatalogPtr catal, + xmlACatalogResolveSystem(xmlCatalog *catal, const xmlChar *sysID); XMLPUBFUN xmlChar * - xmlACatalogResolvePublic(xmlCatalogPtr catal, + xmlACatalogResolvePublic(xmlCatalog *catal, const xmlChar *pubID); XMLPUBFUN xmlChar * - xmlACatalogResolveURI (xmlCatalogPtr catal, + xmlACatalogResolveURI (xmlCatalog *catal, const xmlChar *URI); #ifdef LIBXML_OUTPUT_ENABLED XMLPUBFUN void - xmlACatalogDump (xmlCatalogPtr catal, + xmlACatalogDump (xmlCatalog *catal, FILE *out); #endif /* LIBXML_OUTPUT_ENABLED */ XMLPUBFUN void - xmlFreeCatalog (xmlCatalogPtr catal); + xmlFreeCatalog (xmlCatalog *catal); XMLPUBFUN int - xmlCatalogIsEmpty (xmlCatalogPtr catal); + xmlCatalogIsEmpty (xmlCatalog *catal); /* * Global operations. @@ -139,7 +139,7 @@ XMLPUBFUN int XMLPUBFUN int xmlCatalogRemove (const xmlChar *value); XML_DEPRECATED -XMLPUBFUN xmlDocPtr +XMLPUBFUN xmlDoc * xmlParseCatalogFile (const char *filename); XMLPUBFUN int xmlCatalogConvert (void); diff --git a/include/libxml/debugXML.h b/include/libxml/debugXML.h index 5344c6d6..1456cc4c 100644 --- a/include/libxml/debugXML.h +++ b/include/libxml/debugXML.h @@ -33,36 +33,36 @@ XMLPUBFUN void const xmlChar *str); XMLPUBFUN void xmlDebugDumpAttr (FILE *output, - xmlAttrPtr attr, + xmlAttr *attr, int depth); XMLPUBFUN void xmlDebugDumpAttrList (FILE *output, - xmlAttrPtr attr, + xmlAttr *attr, int depth); XMLPUBFUN void xmlDebugDumpOneNode (FILE *output, - xmlNodePtr node, + xmlNode *node, int depth); XMLPUBFUN void xmlDebugDumpNode (FILE *output, - xmlNodePtr node, + xmlNode *node, int depth); XMLPUBFUN void xmlDebugDumpNodeList (FILE *output, - xmlNodePtr node, + xmlNode *node, int depth); XMLPUBFUN void xmlDebugDumpDocumentHead(FILE *output, - xmlDocPtr doc); + xmlDoc *doc); XMLPUBFUN void xmlDebugDumpDocument (FILE *output, - xmlDocPtr doc); + xmlDoc *doc); XMLPUBFUN void xmlDebugDumpDTD (FILE *output, - xmlDtdPtr dtd); + xmlDtd *dtd); XMLPUBFUN void xmlDebugDumpEntities (FILE *output, - xmlDocPtr doc); + xmlDoc *doc); /**************************************************************** * * @@ -72,7 +72,7 @@ XMLPUBFUN void XMLPUBFUN int xmlDebugCheckDocument (FILE * output, - xmlDocPtr doc); + xmlDoc *doc); #ifdef __cplusplus } diff --git a/include/libxml/dict.h b/include/libxml/dict.h index 36ff6798..f4b83df2 100644 --- a/include/libxml/dict.h +++ b/include/libxml/dict.h @@ -37,40 +37,40 @@ XMLPUBFUN int xmlInitializeDict(void); /* * Constructor and destructor. */ -XMLPUBFUN xmlDictPtr +XMLPUBFUN xmlDict * xmlDictCreate (void); XMLPUBFUN size_t - xmlDictSetLimit (xmlDictPtr dict, + xmlDictSetLimit (xmlDict *dict, size_t limit); XMLPUBFUN size_t - xmlDictGetUsage (xmlDictPtr dict); -XMLPUBFUN xmlDictPtr - xmlDictCreateSub(xmlDictPtr sub); + xmlDictGetUsage (xmlDict *dict); +XMLPUBFUN xmlDict * + xmlDictCreateSub(xmlDict *sub); XMLPUBFUN int - xmlDictReference(xmlDictPtr dict); + xmlDictReference(xmlDict *dict); XMLPUBFUN void - xmlDictFree (xmlDictPtr dict); + xmlDictFree (xmlDict *dict); /* * Lookup of entry in the dictionary. */ XMLPUBFUN const xmlChar * - xmlDictLookup (xmlDictPtr dict, + xmlDictLookup (xmlDict *dict, const xmlChar *name, int len); XMLPUBFUN const xmlChar * - xmlDictExists (xmlDictPtr dict, + xmlDictExists (xmlDict *dict, const xmlChar *name, int len); XMLPUBFUN const xmlChar * - xmlDictQLookup (xmlDictPtr dict, + xmlDictQLookup (xmlDict *dict, const xmlChar *prefix, const xmlChar *name); XMLPUBFUN int - xmlDictOwns (xmlDictPtr dict, + xmlDictOwns (xmlDict *dict, const xmlChar *str); XMLPUBFUN int - xmlDictSize (xmlDictPtr dict); + xmlDictSize (xmlDict *dict); /* * Cleanup function diff --git a/include/libxml/encoding.h b/include/libxml/encoding.h index 205fd65e..524f8b55 100644 --- a/include/libxml/encoding.h +++ b/include/libxml/encoding.h @@ -239,26 +239,26 @@ XMLPUBFUN void xmlCleanupCharEncodingHandlers (void); XML_DEPRECATED XMLPUBFUN void - xmlRegisterCharEncodingHandler (xmlCharEncodingHandlerPtr handler); + xmlRegisterCharEncodingHandler (xmlCharEncodingHandler *handler); XMLPUBFUN xmlParserErrors xmlLookupCharEncodingHandler (xmlCharEncoding enc, - xmlCharEncodingHandlerPtr *out); + xmlCharEncodingHandler **out); XMLPUBFUN xmlParserErrors xmlOpenCharEncodingHandler (const char *name, int output, - xmlCharEncodingHandlerPtr *out); + xmlCharEncodingHandler **out); XMLPUBFUN xmlParserErrors xmlCreateCharEncodingHandler (const char *name, xmlCharEncFlags flags, xmlCharEncConvImpl impl, void *implCtxt, - xmlCharEncodingHandlerPtr *out); -XMLPUBFUN xmlCharEncodingHandlerPtr + xmlCharEncodingHandler **out); +XMLPUBFUN xmlCharEncodingHandler * xmlGetCharEncodingHandler (xmlCharEncoding enc); -XMLPUBFUN xmlCharEncodingHandlerPtr +XMLPUBFUN xmlCharEncodingHandler * xmlFindCharEncodingHandler (const char *name); XML_DEPRECATED -XMLPUBFUN xmlCharEncodingHandlerPtr +XMLPUBFUN xmlCharEncodingHandler * xmlNewCharEncodingHandler (const char *name, xmlCharEncodingInputFunc input, xmlCharEncodingOutputFunc output); diff --git a/include/libxml/entities.h b/include/libxml/entities.h index 28846876..a1b23e63 100644 --- a/include/libxml/entities.h +++ b/include/libxml/entities.h @@ -91,68 +91,68 @@ struct _xmlEntity { typedef struct _xmlHashTable xmlEntitiesTable; typedef xmlEntitiesTable *xmlEntitiesTablePtr; -XMLPUBFUN xmlEntityPtr - xmlNewEntity (xmlDocPtr doc, +XMLPUBFUN xmlEntity * + xmlNewEntity (xmlDoc *doc, const xmlChar *name, int type, const xmlChar *ExternalID, const xmlChar *SystemID, const xmlChar *content); XMLPUBFUN void - xmlFreeEntity (xmlEntityPtr entity); + xmlFreeEntity (xmlEntity *entity); XMLPUBFUN int - xmlAddEntity (xmlDocPtr doc, + xmlAddEntity (xmlDoc *doc, int extSubset, const xmlChar *name, int type, const xmlChar *ExternalID, const xmlChar *SystemID, const xmlChar *content, - xmlEntityPtr *out); -XMLPUBFUN xmlEntityPtr - xmlAddDocEntity (xmlDocPtr doc, + xmlEntity **out); +XMLPUBFUN xmlEntity * + xmlAddDocEntity (xmlDoc *doc, const xmlChar *name, int type, const xmlChar *ExternalID, const xmlChar *SystemID, const xmlChar *content); -XMLPUBFUN xmlEntityPtr - xmlAddDtdEntity (xmlDocPtr doc, +XMLPUBFUN xmlEntity * + xmlAddDtdEntity (xmlDoc *doc, const xmlChar *name, int type, const xmlChar *ExternalID, const xmlChar *SystemID, const xmlChar *content); -XMLPUBFUN xmlEntityPtr +XMLPUBFUN xmlEntity * xmlGetPredefinedEntity (const xmlChar *name); -XMLPUBFUN xmlEntityPtr +XMLPUBFUN xmlEntity * xmlGetDocEntity (const xmlDoc *doc, const xmlChar *name); -XMLPUBFUN xmlEntityPtr - xmlGetDtdEntity (xmlDocPtr doc, +XMLPUBFUN xmlEntity * + xmlGetDtdEntity (xmlDoc *doc, const xmlChar *name); -XMLPUBFUN xmlEntityPtr - xmlGetParameterEntity (xmlDocPtr doc, +XMLPUBFUN xmlEntity * + xmlGetParameterEntity (xmlDoc *doc, const xmlChar *name); XMLPUBFUN xmlChar * - xmlEncodeEntitiesReentrant(xmlDocPtr doc, + xmlEncodeEntitiesReentrant(xmlDoc *doc, const xmlChar *input); XMLPUBFUN xmlChar * xmlEncodeSpecialChars (const xmlDoc *doc, const xmlChar *input); -XMLPUBFUN xmlEntitiesTablePtr +XMLPUBFUN xmlEntitiesTable * xmlCreateEntitiesTable (void); -XMLPUBFUN xmlEntitiesTablePtr - xmlCopyEntitiesTable (xmlEntitiesTablePtr table); +XMLPUBFUN xmlEntitiesTable * + xmlCopyEntitiesTable (xmlEntitiesTable *table); XMLPUBFUN void - xmlFreeEntitiesTable (xmlEntitiesTablePtr table); + xmlFreeEntitiesTable (xmlEntitiesTable *table); #ifdef LIBXML_OUTPUT_ENABLED XMLPUBFUN void - xmlDumpEntitiesTable (xmlBufferPtr buf, - xmlEntitiesTablePtr table); + xmlDumpEntitiesTable (xmlBuffer *buf, + xmlEntitiesTable *table); XMLPUBFUN void - xmlDumpEntityDecl (xmlBufferPtr buf, - xmlEntityPtr ent); + xmlDumpEntityDecl (xmlBuffer *buf, + xmlEntity *ent); #endif /* LIBXML_OUTPUT_ENABLED */ #ifdef __cplusplus diff --git a/include/libxml/hash.h b/include/libxml/hash.h index cb251347..4c84e9f3 100644 --- a/include/libxml/hash.h +++ b/include/libxml/hash.h @@ -89,13 +89,13 @@ typedef void (*xmlHashScannerFull)(void *payload, void *data, /* * Constructor and destructor. */ -XMLPUBFUN xmlHashTablePtr +XMLPUBFUN xmlHashTable * xmlHashCreate (int size); -XMLPUBFUN xmlHashTablePtr +XMLPUBFUN xmlHashTable * xmlHashCreateDict (int size, - xmlDictPtr dict); + xmlDict *dict); XMLPUBFUN void - xmlHashFree (xmlHashTablePtr hash, + xmlHashFree (xmlHashTable *hash, xmlHashDeallocator dealloc); XMLPUBFUN void xmlHashDefaultDeallocator(void *entry, @@ -105,48 +105,48 @@ XMLPUBFUN void * Add a new entry to the hash table. */ XMLPUBFUN int - xmlHashAdd (xmlHashTablePtr hash, + xmlHashAdd (xmlHashTable *hash, const xmlChar *name, void *userdata); XMLPUBFUN int - xmlHashAddEntry (xmlHashTablePtr hash, + xmlHashAddEntry (xmlHashTable *hash, const xmlChar *name, void *userdata); XMLPUBFUN int - xmlHashUpdateEntry (xmlHashTablePtr hash, + xmlHashUpdateEntry (xmlHashTable *hash, const xmlChar *name, void *userdata, xmlHashDeallocator dealloc); XMLPUBFUN int - xmlHashAdd2 (xmlHashTablePtr hash, + xmlHashAdd2 (xmlHashTable *hash, const xmlChar *name, const xmlChar *name2, void *userdata); XMLPUBFUN int - xmlHashAddEntry2 (xmlHashTablePtr hash, + xmlHashAddEntry2 (xmlHashTable *hash, const xmlChar *name, const xmlChar *name2, void *userdata); XMLPUBFUN int - xmlHashUpdateEntry2 (xmlHashTablePtr hash, + xmlHashUpdateEntry2 (xmlHashTable *hash, const xmlChar *name, const xmlChar *name2, void *userdata, xmlHashDeallocator dealloc); XMLPUBFUN int - xmlHashAdd3 (xmlHashTablePtr hash, + xmlHashAdd3 (xmlHashTable *hash, const xmlChar *name, const xmlChar *name2, const xmlChar *name3, void *userdata); XMLPUBFUN int - xmlHashAddEntry3 (xmlHashTablePtr hash, + xmlHashAddEntry3 (xmlHashTable *hash, const xmlChar *name, const xmlChar *name2, const xmlChar *name3, void *userdata); XMLPUBFUN int - xmlHashUpdateEntry3 (xmlHashTablePtr hash, + xmlHashUpdateEntry3 (xmlHashTable *hash, const xmlChar *name, const xmlChar *name2, const xmlChar *name3, @@ -157,16 +157,16 @@ XMLPUBFUN int * Remove an entry from the hash table. */ XMLPUBFUN int - xmlHashRemoveEntry (xmlHashTablePtr hash, + xmlHashRemoveEntry (xmlHashTable *hash, const xmlChar *name, xmlHashDeallocator dealloc); XMLPUBFUN int - xmlHashRemoveEntry2 (xmlHashTablePtr hash, + xmlHashRemoveEntry2 (xmlHashTable *hash, const xmlChar *name, const xmlChar *name2, xmlHashDeallocator dealloc); XMLPUBFUN int - xmlHashRemoveEntry3 (xmlHashTablePtr hash, + xmlHashRemoveEntry3 (xmlHashTable *hash, const xmlChar *name, const xmlChar *name2, const xmlChar *name3, @@ -176,29 +176,29 @@ XMLPUBFUN int * Retrieve the payload. */ XMLPUBFUN void * - xmlHashLookup (xmlHashTablePtr hash, + xmlHashLookup (xmlHashTable *hash, const xmlChar *name); XMLPUBFUN void * - xmlHashLookup2 (xmlHashTablePtr hash, + xmlHashLookup2 (xmlHashTable *hash, const xmlChar *name, const xmlChar *name2); XMLPUBFUN void * - xmlHashLookup3 (xmlHashTablePtr hash, + xmlHashLookup3 (xmlHashTable *hash, const xmlChar *name, const xmlChar *name2, const xmlChar *name3); XMLPUBFUN void * - xmlHashQLookup (xmlHashTablePtr hash, + xmlHashQLookup (xmlHashTable *hash, const xmlChar *prefix, const xmlChar *name); XMLPUBFUN void * - xmlHashQLookup2 (xmlHashTablePtr hash, + xmlHashQLookup2 (xmlHashTable *hash, const xmlChar *prefix, const xmlChar *name, const xmlChar *prefix2, const xmlChar *name2); XMLPUBFUN void * - xmlHashQLookup3 (xmlHashTablePtr hash, + xmlHashQLookup3 (xmlHashTable *hash, const xmlChar *prefix, const xmlChar *name, const xmlChar *prefix2, @@ -209,32 +209,32 @@ XMLPUBFUN void * /* * Helpers. */ -XMLPUBFUN xmlHashTablePtr - xmlHashCopySafe (xmlHashTablePtr hash, +XMLPUBFUN xmlHashTable * + xmlHashCopySafe (xmlHashTable *hash, xmlHashCopier copy, xmlHashDeallocator dealloc); -XMLPUBFUN xmlHashTablePtr - xmlHashCopy (xmlHashTablePtr hash, +XMLPUBFUN xmlHashTable * + xmlHashCopy (xmlHashTable *hash, xmlHashCopier copy); XMLPUBFUN int - xmlHashSize (xmlHashTablePtr hash); + xmlHashSize (xmlHashTable *hash); XMLPUBFUN void - xmlHashScan (xmlHashTablePtr hash, + xmlHashScan (xmlHashTable *hash, xmlHashScanner scan, void *data); XMLPUBFUN void - xmlHashScan3 (xmlHashTablePtr hash, + xmlHashScan3 (xmlHashTable *hash, const xmlChar *name, const xmlChar *name2, const xmlChar *name3, xmlHashScanner scan, void *data); XMLPUBFUN void - xmlHashScanFull (xmlHashTablePtr hash, + xmlHashScanFull (xmlHashTable *hash, xmlHashScannerFull scan, void *data); XMLPUBFUN void - xmlHashScanFull3 (xmlHashTablePtr hash, + xmlHashScanFull3 (xmlHashTable *hash, const xmlChar *name, const xmlChar *name2, const xmlChar *name3, diff --git a/include/libxml/list.h b/include/libxml/list.h index 2ccc0456..ee8565e7 100644 --- a/include/libxml/list.h +++ b/include/libxml/list.h @@ -31,7 +31,7 @@ typedef xmlList *xmlListPtr; * * @param lk the data to deallocate */ -typedef void (*xmlListDeallocator) (xmlLinkPtr lk); +typedef void (*xmlListDeallocator) (xmlLink *lk); /** * Callback function used to compare 2 data. * @@ -50,80 +50,80 @@ typedef int (*xmlListDataCompare) (const void *data0, const void *data1); typedef int (*xmlListWalker) (const void *data, void *user); /* Creation/Deletion */ -XMLPUBFUN xmlListPtr +XMLPUBFUN xmlList * xmlListCreate (xmlListDeallocator deallocator, xmlListDataCompare compare); XMLPUBFUN void - xmlListDelete (xmlListPtr l); + xmlListDelete (xmlList *l); /* Basic Operators */ XMLPUBFUN void * - xmlListSearch (xmlListPtr l, + xmlListSearch (xmlList *l, void *data); XMLPUBFUN void * - xmlListReverseSearch (xmlListPtr l, + xmlListReverseSearch (xmlList *l, void *data); XMLPUBFUN int - xmlListInsert (xmlListPtr l, + xmlListInsert (xmlList *l, void *data) ; XMLPUBFUN int - xmlListAppend (xmlListPtr l, + xmlListAppend (xmlList *l, void *data) ; XMLPUBFUN int - xmlListRemoveFirst (xmlListPtr l, + xmlListRemoveFirst (xmlList *l, void *data); XMLPUBFUN int - xmlListRemoveLast (xmlListPtr l, + xmlListRemoveLast (xmlList *l, void *data); XMLPUBFUN int - xmlListRemoveAll (xmlListPtr l, + xmlListRemoveAll (xmlList *l, void *data); XMLPUBFUN void - xmlListClear (xmlListPtr l); + xmlListClear (xmlList *l); XMLPUBFUN int - xmlListEmpty (xmlListPtr l); -XMLPUBFUN xmlLinkPtr - xmlListFront (xmlListPtr l); -XMLPUBFUN xmlLinkPtr - xmlListEnd (xmlListPtr l); + xmlListEmpty (xmlList *l); +XMLPUBFUN xmlLink * + xmlListFront (xmlList *l); +XMLPUBFUN xmlLink * + xmlListEnd (xmlList *l); XMLPUBFUN int - xmlListSize (xmlListPtr l); + xmlListSize (xmlList *l); XMLPUBFUN void - xmlListPopFront (xmlListPtr l); + xmlListPopFront (xmlList *l); XMLPUBFUN void - xmlListPopBack (xmlListPtr l); + xmlListPopBack (xmlList *l); XMLPUBFUN int - xmlListPushFront (xmlListPtr l, + xmlListPushFront (xmlList *l, void *data); XMLPUBFUN int - xmlListPushBack (xmlListPtr l, + xmlListPushBack (xmlList *l, void *data); /* Advanced Operators */ XMLPUBFUN void - xmlListReverse (xmlListPtr l); + xmlListReverse (xmlList *l); XMLPUBFUN void - xmlListSort (xmlListPtr l); + xmlListSort (xmlList *l); XMLPUBFUN void - xmlListWalk (xmlListPtr l, + xmlListWalk (xmlList *l, xmlListWalker walker, void *user); XMLPUBFUN void - xmlListReverseWalk (xmlListPtr l, + xmlListReverseWalk (xmlList *l, xmlListWalker walker, void *user); XMLPUBFUN void - xmlListMerge (xmlListPtr l1, - xmlListPtr l2); -XMLPUBFUN xmlListPtr - xmlListDup (xmlListPtr old); + xmlListMerge (xmlList *l1, + xmlList *l2); +XMLPUBFUN xmlList * + xmlListDup (xmlList *old); XMLPUBFUN int - xmlListCopy (xmlListPtr cur, - xmlListPtr old); + xmlListCopy (xmlList *cur, + xmlList *old); /* Link operators */ XMLPUBFUN void * - xmlLinkGetData (xmlLinkPtr lk); + xmlLinkGetData (xmlLink *lk); /* xmlListUnique() */ /* xmlListSwap */ diff --git a/include/libxml/parser.h b/include/libxml/parser.h index 88ccd8eb..21d4b991 100644 --- a/include/libxml/parser.h +++ b/include/libxml/parser.h @@ -98,7 +98,7 @@ typedef void (* xmlParserInputDeallocate)(xmlChar *str); */ struct _xmlParserInput { /* Input buffer */ - xmlParserInputBufferPtr buf; + xmlParserInputBuffer *buf; /* The file analyzed, if any */ const char *filename; /* unused */ @@ -130,7 +130,7 @@ struct _xmlParserInput { /* unused */ unsigned long parentConsumed XML_DEPRECATED_MEMBER; /* entity, if any */ - xmlEntityPtr entity XML_DEPRECATED_MEMBER; + xmlEntity *entity XML_DEPRECATED_MEMBER; }; /** @cond ignore */ @@ -230,7 +230,7 @@ typedef struct _xmlAttrHashBucket xmlAttrHashBucket; typedef xmlParserErrors (*xmlResourceLoader)(void *ctxt, const char *url, const char *publicId, xmlResourceType type, xmlParserInputFlags flags, - xmlParserInputPtr *out); + xmlParserInput **out); /** * Parser context @@ -252,7 +252,7 @@ struct _xmlParserCtxt { * * the document being built */ - xmlDocPtr myDoc; + xmlDoc *myDoc; /** * @deprecated Use xmlCtxtGetStatus() * @@ -296,24 +296,24 @@ struct _xmlParserCtxt { /** * Current input stream */ - xmlParserInputPtr input; + xmlParserInput *input; /* Number of current input streams */ int inputNr; /* Max number of input streams */ int inputMax XML_DEPRECATED_MEMBER; /* stack of inputs */ - xmlParserInputPtr *inputTab; + xmlParserInput **inputTab; /* Node analysis stack only used for DOM building */ /* Current parsed Node */ - xmlNodePtr node XML_DEPRECATED_MEMBER; + xmlNode *node XML_DEPRECATED_MEMBER; /* Depth of the parsing stack */ int nodeNr XML_DEPRECATED_MEMBER; /* Max depth of the parsing stack */ int nodeMax XML_DEPRECATED_MEMBER; /* array of nodes */ - xmlNodePtr *nodeTab XML_DEPRECATED_MEMBER; + xmlNode **nodeTab XML_DEPRECATED_MEMBER; /* Whether node info should be kept */ int record_info; @@ -411,7 +411,7 @@ struct _xmlParserCtxt { /* to prevent entity substitution loops */ int depth XML_DEPRECATED_MEMBER; /* unused */ - xmlParserInputPtr entity XML_DEPRECATED_MEMBER; + xmlParserInput *entity XML_DEPRECATED_MEMBER; /* unused */ int charset XML_DEPRECATED_MEMBER; /* Those two fields are there to speed up large node parsing */ @@ -456,7 +456,7 @@ struct _xmlParserCtxt { * * dictionary for the parser */ - xmlDictPtr dict; + xmlDict *dict; /* array for the attributes callbacks */ const xmlChar **atts XML_DEPRECATED_MEMBER; /* the size of the array */ @@ -488,9 +488,9 @@ struct _xmlParserCtxt { /* array of data for push */ xmlStartTag *pushTab XML_DEPRECATED_MEMBER; /* defaulted attributes if any */ - xmlHashTablePtr attsDefault XML_DEPRECATED_MEMBER; + xmlHashTable *attsDefault XML_DEPRECATED_MEMBER; /* non-CDATA attributes if any */ - xmlHashTablePtr attsSpecial XML_DEPRECATED_MEMBER; + xmlHashTable *attsSpecial XML_DEPRECATED_MEMBER; /** * @deprecated Use xmlCtxtGetStatus() @@ -518,11 +518,11 @@ struct _xmlParserCtxt { /* number of freed element nodes */ int freeElemsNr XML_DEPRECATED_MEMBER; /* List of freed element nodes */ - xmlNodePtr freeElems XML_DEPRECATED_MEMBER; + xmlNode *freeElems XML_DEPRECATED_MEMBER; /* number of freed attributes nodes */ int freeAttrsNr XML_DEPRECATED_MEMBER; /* List of freed attributes nodes */ - xmlAttrPtr freeAttrs XML_DEPRECATED_MEMBER; + xmlAttr *freeAttrs XML_DEPRECATED_MEMBER; /** * @deprecated Use xmlCtxtGetLastError() @@ -599,9 +599,9 @@ struct _xmlSAXLocator { * @param ctx the user data (XML parser context) * @param publicId The public ID of the entity * @param systemId The system ID of the entity - * @returns the xmlParserInputPtr if inlined or NULL for DOM behaviour. + * @returns the xmlParserInput if inlined or NULL for DOM behaviour. */ -typedef xmlParserInputPtr (*resolveEntitySAXFunc) (void *ctx, +typedef xmlParserInput *(*resolveEntitySAXFunc) (void *ctx, const xmlChar *publicId, const xmlChar *systemId); /** @@ -633,18 +633,18 @@ typedef void (*externalSubsetSAXFunc) (void *ctx, * * @param ctx the user data (XML parser context) * @param name The entity name - * @returns the xmlEntityPtr if found. + * @returns the xmlEntity if found. */ -typedef xmlEntityPtr (*getEntitySAXFunc) (void *ctx, +typedef xmlEntity *(*getEntitySAXFunc) (void *ctx, const xmlChar *name); /** * Get a parameter entity by name. * * @param ctx the user data (XML parser context) * @param name The entity name - * @returns the xmlEntityPtr if found. + * @returns the xmlEntity if found. */ -typedef xmlEntityPtr (*getParameterEntitySAXFunc) (void *ctx, +typedef xmlEntity *(*getParameterEntitySAXFunc) (void *ctx, const xmlChar *name); /** * An entity definition has been parsed. @@ -691,7 +691,7 @@ typedef void (*attributeDeclSAXFunc)(void *ctx, int type, int def, const xmlChar *defaultValue, - xmlEnumerationPtr tree); + xmlEnumeration *tree); /** * An element definition has been parsed. * @@ -703,7 +703,7 @@ typedef void (*attributeDeclSAXFunc)(void *ctx, typedef void (*elementDeclSAXFunc)(void *ctx, const xmlChar *name, int type, - xmlElementContentPtr content); + xmlElementContent *content); /** * What to do when an unparsed entity declaration is parsed. * @@ -726,7 +726,7 @@ typedef void (*unparsedEntityDeclSAXFunc)(void *ctx, * @param loc A SAX Locator */ typedef void (*setDocumentLocatorSAXFunc) (void *ctx, - xmlSAXLocatorPtr loc); + xmlSAXLocator *loc); /** * Called when the document start being processed. * @@ -1087,9 +1087,9 @@ struct _xmlSAXHandlerV1 { * @param context the XML parser context * @returns the entity input parser. */ -typedef xmlParserInputPtr (*xmlExternalEntityLoader) (const char *URL, +typedef xmlParserInput *(*xmlExternalEntityLoader) (const char *URL, const char *ID, - xmlParserCtxtPtr context); + xmlParserCtxt *context); /* * Variables @@ -1235,21 +1235,21 @@ XMLPUBFUN void */ XML_DEPRECATED XMLPUBFUN int - xmlParserInputRead (xmlParserInputPtr in, + xmlParserInputRead (xmlParserInput *in, int len); XMLPUBFUN int - xmlParserInputGrow (xmlParserInputPtr in, + xmlParserInputGrow (xmlParserInput *in, int len); /* * Basic parsing Interfaces */ #ifdef LIBXML_SAX1_ENABLED -XMLPUBFUN xmlDocPtr +XMLPUBFUN xmlDoc * xmlParseDoc (const xmlChar *cur); -XMLPUBFUN xmlDocPtr +XMLPUBFUN xmlDoc * xmlParseFile (const char *filename); -XMLPUBFUN xmlDocPtr +XMLPUBFUN xmlDoc * xmlParseMemory (const char *buffer, int size); #endif /* LIBXML_SAX1_ENABLED */ @@ -1259,7 +1259,7 @@ XMLPUBFUN int XMLPUBFUN int xmlKeepBlanksDefault (int val); XMLPUBFUN void - xmlStopParser (xmlParserCtxtPtr ctxt); + xmlStopParser (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN int xmlPedanticParserDefault(int val); @@ -1294,14 +1294,14 @@ XMLPUBFUN int * Recovery mode */ XML_DEPRECATED -XMLPUBFUN xmlDocPtr +XMLPUBFUN xmlDoc * xmlRecoverDoc (const xmlChar *cur); XML_DEPRECATED -XMLPUBFUN xmlDocPtr +XMLPUBFUN xmlDoc * xmlRecoverMemory (const char *buffer, int size); XML_DEPRECATED -XMLPUBFUN xmlDocPtr +XMLPUBFUN xmlDoc * xmlRecoverFile (const char *filename); #endif /* LIBXML_SAX1_ENABLED */ @@ -1309,163 +1309,163 @@ XMLPUBFUN xmlDocPtr * Less common routines and SAX interfaces */ XMLPUBFUN int - xmlParseDocument (xmlParserCtxtPtr ctxt); + xmlParseDocument (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN int - xmlParseExtParsedEnt (xmlParserCtxtPtr ctxt); + xmlParseExtParsedEnt (xmlParserCtxt *ctxt); #ifdef LIBXML_SAX1_ENABLED XML_DEPRECATED XMLPUBFUN int - xmlSAXUserParseFile (xmlSAXHandlerPtr sax, + xmlSAXUserParseFile (xmlSAXHandler *sax, void *user_data, const char *filename); XML_DEPRECATED XMLPUBFUN int - xmlSAXUserParseMemory (xmlSAXHandlerPtr sax, + xmlSAXUserParseMemory (xmlSAXHandler *sax, void *user_data, const char *buffer, int size); XML_DEPRECATED -XMLPUBFUN xmlDocPtr - xmlSAXParseDoc (xmlSAXHandlerPtr sax, +XMLPUBFUN xmlDoc * + xmlSAXParseDoc (xmlSAXHandler *sax, const xmlChar *cur, int recovery); XML_DEPRECATED -XMLPUBFUN xmlDocPtr - xmlSAXParseMemory (xmlSAXHandlerPtr sax, +XMLPUBFUN xmlDoc * + xmlSAXParseMemory (xmlSAXHandler *sax, const char *buffer, int size, int recovery); XML_DEPRECATED -XMLPUBFUN xmlDocPtr - xmlSAXParseMemoryWithData (xmlSAXHandlerPtr sax, +XMLPUBFUN xmlDoc * + xmlSAXParseMemoryWithData (xmlSAXHandler *sax, const char *buffer, int size, int recovery, void *data); XML_DEPRECATED -XMLPUBFUN xmlDocPtr - xmlSAXParseFile (xmlSAXHandlerPtr sax, +XMLPUBFUN xmlDoc * + xmlSAXParseFile (xmlSAXHandler *sax, const char *filename, int recovery); XML_DEPRECATED -XMLPUBFUN xmlDocPtr - xmlSAXParseFileWithData (xmlSAXHandlerPtr sax, +XMLPUBFUN xmlDoc * + xmlSAXParseFileWithData (xmlSAXHandler *sax, const char *filename, int recovery, void *data); XML_DEPRECATED -XMLPUBFUN xmlDocPtr - xmlSAXParseEntity (xmlSAXHandlerPtr sax, +XMLPUBFUN xmlDoc * + xmlSAXParseEntity (xmlSAXHandler *sax, const char *filename); XML_DEPRECATED -XMLPUBFUN xmlDocPtr +XMLPUBFUN xmlDoc * xmlParseEntity (const char *filename); #endif /* LIBXML_SAX1_ENABLED */ #ifdef LIBXML_VALID_ENABLED -XMLPUBFUN xmlDtdPtr - xmlCtxtParseDtd (xmlParserCtxtPtr ctxt, - xmlParserInputPtr input, +XMLPUBFUN xmlDtd * + xmlCtxtParseDtd (xmlParserCtxt *ctxt, + xmlParserInput *input, const xmlChar *ExternalID, const xmlChar *SystemID); XMLPUBFUN int - xmlCtxtValidateDocument (xmlParserCtxtPtr ctxt, - xmlDocPtr doc); + xmlCtxtValidateDocument (xmlParserCtxt *ctxt, + xmlDoc *doc); XMLPUBFUN int - xmlCtxtValidateDtd (xmlParserCtxtPtr ctxt, - xmlDocPtr doc, - xmlDtdPtr dtd); + xmlCtxtValidateDtd (xmlParserCtxt *ctxt, + xmlDoc *doc, + xmlDtd *dtd); XML_DEPRECATED -XMLPUBFUN xmlDtdPtr - xmlSAXParseDTD (xmlSAXHandlerPtr sax, +XMLPUBFUN xmlDtd * + xmlSAXParseDTD (xmlSAXHandler *sax, const xmlChar *ExternalID, const xmlChar *SystemID); -XMLPUBFUN xmlDtdPtr +XMLPUBFUN xmlDtd * xmlParseDTD (const xmlChar *ExternalID, const xmlChar *SystemID); -XMLPUBFUN xmlDtdPtr - xmlIOParseDTD (xmlSAXHandlerPtr sax, - xmlParserInputBufferPtr input, +XMLPUBFUN xmlDtd * + xmlIOParseDTD (xmlSAXHandler *sax, + xmlParserInputBuffer *input, xmlCharEncoding enc); #endif /* LIBXML_VALID_ENABLE */ #ifdef LIBXML_SAX1_ENABLED XMLPUBFUN int - xmlParseBalancedChunkMemory(xmlDocPtr doc, - xmlSAXHandlerPtr sax, + xmlParseBalancedChunkMemory(xmlDoc *doc, + xmlSAXHandler *sax, void *user_data, int depth, const xmlChar *string, - xmlNodePtr *lst); + xmlNode **lst); #endif /* LIBXML_SAX1_ENABLED */ XMLPUBFUN xmlParserErrors - xmlParseInNodeContext (xmlNodePtr node, + xmlParseInNodeContext (xmlNode *node, const char *data, int datalen, int options, - xmlNodePtr *lst); + xmlNode **lst); #ifdef LIBXML_SAX1_ENABLED XMLPUBFUN int - xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc, - xmlSAXHandlerPtr sax, + xmlParseBalancedChunkMemoryRecover(xmlDoc *doc, + xmlSAXHandler *sax, void *user_data, int depth, const xmlChar *string, - xmlNodePtr *lst, + xmlNode **lst, int recover); XML_DEPRECATED XMLPUBFUN int - xmlParseExternalEntity (xmlDocPtr doc, - xmlSAXHandlerPtr sax, + xmlParseExternalEntity (xmlDoc *doc, + xmlSAXHandler *sax, void *user_data, int depth, const xmlChar *URL, const xmlChar *ID, - xmlNodePtr *lst); + xmlNode **lst); #endif /* LIBXML_SAX1_ENABLED */ XMLPUBFUN int - xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctx, + xmlParseCtxtExternalEntity(xmlParserCtxt *ctx, const xmlChar *URL, const xmlChar *ID, - xmlNodePtr *lst); + xmlNode **lst); /* * Parser contexts handling. */ -XMLPUBFUN xmlParserCtxtPtr +XMLPUBFUN xmlParserCtxt * xmlNewParserCtxt (void); -XMLPUBFUN xmlParserCtxtPtr +XMLPUBFUN xmlParserCtxt * xmlNewSAXParserCtxt (const xmlSAXHandler *sax, void *userData); XMLPUBFUN int - xmlInitParserCtxt (xmlParserCtxtPtr ctxt); + xmlInitParserCtxt (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN void - xmlClearParserCtxt (xmlParserCtxtPtr ctxt); + xmlClearParserCtxt (xmlParserCtxt *ctxt); XMLPUBFUN void - xmlFreeParserCtxt (xmlParserCtxtPtr ctxt); + xmlFreeParserCtxt (xmlParserCtxt *ctxt); #ifdef LIBXML_SAX1_ENABLED XML_DEPRECATED XMLPUBFUN void - xmlSetupParserForBuffer (xmlParserCtxtPtr ctxt, + xmlSetupParserForBuffer (xmlParserCtxt *ctxt, const xmlChar* buffer, const char *filename); #endif /* LIBXML_SAX1_ENABLED */ -XMLPUBFUN xmlParserCtxtPtr +XMLPUBFUN xmlParserCtxt * xmlCreateDocParserCtxt (const xmlChar *cur); #ifdef LIBXML_PUSH_ENABLED /* * Interfaces for the Push mode. */ -XMLPUBFUN xmlParserCtxtPtr - xmlCreatePushParserCtxt(xmlSAXHandlerPtr sax, +XMLPUBFUN xmlParserCtxt * + xmlCreatePushParserCtxt(xmlSAXHandler *sax, void *user_data, const char *chunk, int size, const char *filename); XMLPUBFUN int - xmlParseChunk (xmlParserCtxtPtr ctxt, + xmlParseChunk (xmlParserCtxt *ctxt, const char *chunk, int size, int terminate); @@ -1475,17 +1475,17 @@ XMLPUBFUN int * Special I/O mode. */ -XMLPUBFUN xmlParserCtxtPtr - xmlCreateIOParserCtxt (xmlSAXHandlerPtr sax, +XMLPUBFUN xmlParserCtxt * + xmlCreateIOParserCtxt (xmlSAXHandler *sax, void *user_data, xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void *ioctx, xmlCharEncoding enc); -XMLPUBFUN xmlParserInputPtr - xmlNewIOInputStream (xmlParserCtxtPtr ctxt, - xmlParserInputBufferPtr input, +XMLPUBFUN xmlParserInput * + xmlNewIOInputStream (xmlParserCtxt *ctxt, + xmlParserInputBuffer *input, xmlCharEncoding enc); /* @@ -1493,22 +1493,22 @@ XMLPUBFUN xmlParserInputPtr */ XML_DEPRECATED XMLPUBFUN const xmlParserNodeInfo* - xmlParserFindNodeInfo (xmlParserCtxtPtr ctxt, - xmlNodePtr node); + xmlParserFindNodeInfo (xmlParserCtxt *ctxt, + xmlNode *node); XML_DEPRECATED XMLPUBFUN void - xmlInitNodeInfoSeq (xmlParserNodeInfoSeqPtr seq); + xmlInitNodeInfoSeq (xmlParserNodeInfoSeq *seq); XML_DEPRECATED XMLPUBFUN void - xmlClearNodeInfoSeq (xmlParserNodeInfoSeqPtr seq); + xmlClearNodeInfoSeq (xmlParserNodeInfoSeq *seq); XML_DEPRECATED XMLPUBFUN unsigned long - xmlParserFindNodeInfoIndex(xmlParserNodeInfoSeqPtr seq, - xmlNodePtr node); + xmlParserFindNodeInfoIndex(xmlParserNodeInfoSeq *seq, + xmlNode *node); XML_DEPRECATED XMLPUBFUN void - xmlParserAddNodeInfo (xmlParserCtxtPtr ctxt, - xmlParserNodeInfoPtr info); + xmlParserAddNodeInfo (xmlParserCtxt *ctxt, + xmlParserNodeInfo *info); /* * External entities handling actually implemented in xmlIO. @@ -1518,14 +1518,14 @@ XMLPUBFUN void xmlSetExternalEntityLoader(xmlExternalEntityLoader f); XMLPUBFUN xmlExternalEntityLoader xmlGetExternalEntityLoader(void); -XMLPUBFUN xmlParserInputPtr +XMLPUBFUN xmlParserInput * xmlLoadExternalEntity (const char *URL, const char *ID, - xmlParserCtxtPtr ctxt); + xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN long - xmlByteConsumed (xmlParserCtxtPtr ctxt); + xmlByteConsumed (xmlParserCtxt *ctxt); /* * New set of simpler/more flexible APIs @@ -1722,135 +1722,135 @@ typedef enum { } xmlParserOption; XMLPUBFUN void - xmlCtxtReset (xmlParserCtxtPtr ctxt); + xmlCtxtReset (xmlParserCtxt *ctxt); XMLPUBFUN int - xmlCtxtResetPush (xmlParserCtxtPtr ctxt, + xmlCtxtResetPush (xmlParserCtxt *ctxt, const char *chunk, int size, const char *filename, const char *encoding); XMLPUBFUN int - xmlCtxtGetOptions (xmlParserCtxtPtr ctxt); + xmlCtxtGetOptions (xmlParserCtxt *ctxt); XMLPUBFUN int - xmlCtxtSetOptions (xmlParserCtxtPtr ctxt, + xmlCtxtSetOptions (xmlParserCtxt *ctxt, int options); XMLPUBFUN int - xmlCtxtUseOptions (xmlParserCtxtPtr ctxt, + xmlCtxtUseOptions (xmlParserCtxt *ctxt, int options); XMLPUBFUN void * - xmlCtxtGetPrivate (xmlParserCtxtPtr ctxt); + xmlCtxtGetPrivate (xmlParserCtxt *ctxt); XMLPUBFUN void - xmlCtxtSetPrivate (xmlParserCtxtPtr ctxt, + xmlCtxtSetPrivate (xmlParserCtxt *ctxt, void *priv); XMLPUBFUN void * - xmlCtxtGetCatalogs (xmlParserCtxtPtr ctxt); + xmlCtxtGetCatalogs (xmlParserCtxt *ctxt); XMLPUBFUN void - xmlCtxtSetCatalogs (xmlParserCtxtPtr ctxt, + xmlCtxtSetCatalogs (xmlParserCtxt *ctxt, void *catalogs); -XMLPUBFUN xmlDictPtr - xmlCtxtGetDict (xmlParserCtxtPtr ctxt); +XMLPUBFUN xmlDict * + xmlCtxtGetDict (xmlParserCtxt *ctxt); XMLPUBFUN void - xmlCtxtSetDict (xmlParserCtxtPtr ctxt, - xmlDictPtr); + xmlCtxtSetDict (xmlParserCtxt *ctxt, + xmlDict *); XMLPUBFUN xmlSAXHandler * - xmlCtxtGetSaxHandler (xmlParserCtxtPtr ctxt); + xmlCtxtGetSaxHandler (xmlParserCtxt *ctxt); XMLPUBFUN int - xmlCtxtSetSaxHandler (xmlParserCtxtPtr ctxt, + xmlCtxtSetSaxHandler (xmlParserCtxt *ctxt, const xmlSAXHandler *sax); -XMLPUBFUN xmlDocPtr - xmlCtxtGetDocument (xmlParserCtxtPtr ctxt); +XMLPUBFUN xmlDoc * + xmlCtxtGetDocument (xmlParserCtxt *ctxt); XMLPUBFUN int - xmlCtxtIsHtml (xmlParserCtxtPtr ctxt); + xmlCtxtIsHtml (xmlParserCtxt *ctxt); XMLPUBFUN int - xmlCtxtIsStopped (xmlParserCtxtPtr ctxt); + xmlCtxtIsStopped (xmlParserCtxt *ctxt); #ifdef LIBXML_VALID_ENABLED -XMLPUBFUN xmlValidCtxtPtr - xmlCtxtGetValidCtxt (xmlParserCtxtPtr ctxt); +XMLPUBFUN xmlValidCtxt * + xmlCtxtGetValidCtxt (xmlParserCtxt *ctxt); #endif XMLPUBFUN const xmlChar * - xmlCtxtGetVersion (xmlParserCtxtPtr ctxt); + xmlCtxtGetVersion (xmlParserCtxt *ctxt); XMLPUBFUN const xmlChar * - xmlCtxtGetDeclaredEncoding(xmlParserCtxtPtr ctxt); + xmlCtxtGetDeclaredEncoding(xmlParserCtxt *ctxt); XMLPUBFUN int - xmlCtxtGetStandalone (xmlParserCtxtPtr ctxt); + xmlCtxtGetStandalone (xmlParserCtxt *ctxt); XMLPUBFUN xmlParserStatus - xmlCtxtGetStatus (xmlParserCtxtPtr ctxt); + xmlCtxtGetStatus (xmlParserCtxt *ctxt); XMLPUBFUN void - xmlCtxtSetErrorHandler (xmlParserCtxtPtr ctxt, + xmlCtxtSetErrorHandler (xmlParserCtxt *ctxt, xmlStructuredErrorFunc handler, void *data); XMLPUBFUN void - xmlCtxtSetResourceLoader(xmlParserCtxtPtr ctxt, + xmlCtxtSetResourceLoader(xmlParserCtxt *ctxt, xmlResourceLoader loader, void *vctxt); XMLPUBFUN void - xmlCtxtSetCharEncConvImpl(xmlParserCtxtPtr ctxt, + xmlCtxtSetCharEncConvImpl(xmlParserCtxt *ctxt, xmlCharEncConvImpl impl, void *vctxt); XMLPUBFUN void - xmlCtxtSetMaxAmplification(xmlParserCtxtPtr ctxt, + xmlCtxtSetMaxAmplification(xmlParserCtxt *ctxt, unsigned maxAmpl); -XMLPUBFUN xmlDocPtr +XMLPUBFUN xmlDoc * xmlReadDoc (const xmlChar *cur, const char *URL, const char *encoding, int options); -XMLPUBFUN xmlDocPtr +XMLPUBFUN xmlDoc * xmlReadFile (const char *URL, const char *encoding, int options); -XMLPUBFUN xmlDocPtr +XMLPUBFUN xmlDoc * xmlReadMemory (const char *buffer, int size, const char *URL, const char *encoding, int options); -XMLPUBFUN xmlDocPtr +XMLPUBFUN xmlDoc * xmlReadFd (int fd, const char *URL, const char *encoding, int options); -XMLPUBFUN xmlDocPtr +XMLPUBFUN xmlDoc * xmlReadIO (xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void *ioctx, const char *URL, const char *encoding, int options); -XMLPUBFUN xmlDocPtr - xmlCtxtParseDocument (xmlParserCtxtPtr ctxt, - xmlParserInputPtr input); -XMLPUBFUN xmlNodePtr - xmlCtxtParseContent (xmlParserCtxtPtr ctxt, - xmlParserInputPtr input, - xmlNodePtr node, +XMLPUBFUN xmlDoc * + xmlCtxtParseDocument (xmlParserCtxt *ctxt, + xmlParserInput *input); +XMLPUBFUN xmlNode * + xmlCtxtParseContent (xmlParserCtxt *ctxt, + xmlParserInput *input, + xmlNode *node, int hasTextDecl); -XMLPUBFUN xmlDocPtr - xmlCtxtReadDoc (xmlParserCtxtPtr ctxt, +XMLPUBFUN xmlDoc * + xmlCtxtReadDoc (xmlParserCtxt *ctxt, const xmlChar *cur, const char *URL, const char *encoding, int options); -XMLPUBFUN xmlDocPtr - xmlCtxtReadFile (xmlParserCtxtPtr ctxt, +XMLPUBFUN xmlDoc * + xmlCtxtReadFile (xmlParserCtxt *ctxt, const char *filename, const char *encoding, int options); -XMLPUBFUN xmlDocPtr - xmlCtxtReadMemory (xmlParserCtxtPtr ctxt, +XMLPUBFUN xmlDoc * + xmlCtxtReadMemory (xmlParserCtxt *ctxt, const char *buffer, int size, const char *URL, const char *encoding, int options); -XMLPUBFUN xmlDocPtr - xmlCtxtReadFd (xmlParserCtxtPtr ctxt, +XMLPUBFUN xmlDoc * + xmlCtxtReadFd (xmlParserCtxt *ctxt, int fd, const char *URL, const char *encoding, int options); -XMLPUBFUN xmlDocPtr - xmlCtxtReadIO (xmlParserCtxtPtr ctxt, +XMLPUBFUN xmlDoc * + xmlCtxtReadIO (xmlParserCtxt *ctxt, xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void *ioctx, @@ -1864,22 +1864,22 @@ XMLPUBFUN xmlDocPtr XMLPUBFUN xmlParserErrors xmlNewInputFromUrl(const char *url, xmlParserInputFlags flags, - xmlParserInputPtr *out); -XMLPUBFUN xmlParserInputPtr + xmlParserInput **out); +XMLPUBFUN xmlParserInput * xmlNewInputFromMemory(const char *url, const void *mem, size_t size, xmlParserInputFlags flags); -XMLPUBFUN xmlParserInputPtr +XMLPUBFUN xmlParserInput * xmlNewInputFromString(const char *url, const char *str, xmlParserInputFlags flags); -XMLPUBFUN xmlParserInputPtr +XMLPUBFUN xmlParserInput * xmlNewInputFromFd(const char *url, int fd, xmlParserInputFlags flags); -XMLPUBFUN xmlParserInputPtr +XMLPUBFUN xmlParserInput * xmlNewInputFromIO(const char *url, xmlInputReadCallback ioRead, xmlInputCloseCallback ioClose, void *ioCtxt, xmlParserInputFlags flags); XMLPUBFUN xmlParserErrors -xmlInputSetEncodingHandler(xmlParserInputPtr input, - xmlCharEncodingHandlerPtr handler); +xmlInputSetEncodingHandler(xmlParserInput *input, + xmlCharEncodingHandler *handler); /* * Library wide options diff --git a/include/libxml/parserInternals.h b/include/libxml/parserInternals.h index e38fa01a..2646621f 100644 --- a/include/libxml/parserInternals.h +++ b/include/libxml/parserInternals.h @@ -261,71 +261,71 @@ XMLPUBFUN int xmlIsLetter (int c); /* * Parser context. */ -XMLPUBFUN xmlParserCtxtPtr +XMLPUBFUN xmlParserCtxt * xmlCreateFileParserCtxt (const char *filename); -XMLPUBFUN xmlParserCtxtPtr +XMLPUBFUN xmlParserCtxt * xmlCreateURLParserCtxt (const char *filename, int options); -XMLPUBFUN xmlParserCtxtPtr +XMLPUBFUN xmlParserCtxt * xmlCreateMemoryParserCtxt(const char *buffer, int size); XML_DEPRECATED -XMLPUBFUN xmlParserCtxtPtr +XMLPUBFUN xmlParserCtxt * xmlCreateEntityParserCtxt(const xmlChar *URL, const xmlChar *ID, const xmlChar *base); XMLPUBFUN void - xmlCtxtErrMemory (xmlParserCtxtPtr ctxt); + xmlCtxtErrMemory (xmlParserCtxt *ctxt); XMLPUBFUN int - xmlSwitchEncoding (xmlParserCtxtPtr ctxt, + xmlSwitchEncoding (xmlParserCtxt *ctxt, xmlCharEncoding enc); XMLPUBFUN int - xmlSwitchEncodingName (xmlParserCtxtPtr ctxt, + xmlSwitchEncodingName (xmlParserCtxt *ctxt, const char *encoding); XMLPUBFUN int - xmlSwitchToEncoding (xmlParserCtxtPtr ctxt, - xmlCharEncodingHandlerPtr handler); + xmlSwitchToEncoding (xmlParserCtxt *ctxt, + xmlCharEncodingHandler *handler); XML_DEPRECATED XMLPUBFUN int - xmlSwitchInputEncoding (xmlParserCtxtPtr ctxt, - xmlParserInputPtr input, - xmlCharEncodingHandlerPtr handler); + xmlSwitchInputEncoding (xmlParserCtxt *ctxt, + xmlParserInput *input, + xmlCharEncodingHandler *handler); /* * Input Streams. */ -XMLPUBFUN xmlParserInputPtr - xmlNewStringInputStream (xmlParserCtxtPtr ctxt, +XMLPUBFUN xmlParserInput * + xmlNewStringInputStream (xmlParserCtxt *ctxt, const xmlChar *buffer); XML_DEPRECATED -XMLPUBFUN xmlParserInputPtr - xmlNewEntityInputStream (xmlParserCtxtPtr ctxt, - xmlEntityPtr entity); +XMLPUBFUN xmlParserInput * + xmlNewEntityInputStream (xmlParserCtxt *ctxt, + xmlEntity *entity); XMLPUBFUN int - xmlCtxtPushInput (xmlParserCtxtPtr ctxt, - xmlParserInputPtr input); -XMLPUBFUN xmlParserInputPtr - xmlCtxtPopInput (xmlParserCtxtPtr ctxt); + xmlCtxtPushInput (xmlParserCtxt *ctxt, + xmlParserInput *input); +XMLPUBFUN xmlParserInput * + xmlCtxtPopInput (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN int - xmlPushInput (xmlParserCtxtPtr ctxt, - xmlParserInputPtr input); + xmlPushInput (xmlParserCtxt *ctxt, + xmlParserInput *input); XML_DEPRECATED XMLPUBFUN xmlChar - xmlPopInput (xmlParserCtxtPtr ctxt); + xmlPopInput (xmlParserCtxt *ctxt); XMLPUBFUN void - xmlFreeInputStream (xmlParserInputPtr input); -XMLPUBFUN xmlParserInputPtr - xmlNewInputFromFile (xmlParserCtxtPtr ctxt, + xmlFreeInputStream (xmlParserInput *input); +XMLPUBFUN xmlParserInput * + xmlNewInputFromFile (xmlParserCtxt *ctxt, const char *filename); -XMLPUBFUN xmlParserInputPtr - xmlNewInputStream (xmlParserCtxtPtr ctxt); +XMLPUBFUN xmlParserInput * + xmlNewInputStream (xmlParserCtxt *ctxt); /* * Namespaces. */ XMLPUBFUN xmlChar * - xmlSplitQName (xmlParserCtxtPtr ctxt, + xmlSplitQName (xmlParserCtxt *ctxt, const xmlChar *name, xmlChar **prefix); @@ -334,151 +334,151 @@ XMLPUBFUN xmlChar * */ XML_DEPRECATED XMLPUBFUN const xmlChar * - xmlParseName (xmlParserCtxtPtr ctxt); + xmlParseName (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN xmlChar * - xmlParseNmtoken (xmlParserCtxtPtr ctxt); + xmlParseNmtoken (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN xmlChar * - xmlParseEntityValue (xmlParserCtxtPtr ctxt, + xmlParseEntityValue (xmlParserCtxt *ctxt, xmlChar **orig); XML_DEPRECATED XMLPUBFUN xmlChar * - xmlParseAttValue (xmlParserCtxtPtr ctxt); + xmlParseAttValue (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN xmlChar * - xmlParseSystemLiteral (xmlParserCtxtPtr ctxt); + xmlParseSystemLiteral (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN xmlChar * - xmlParsePubidLiteral (xmlParserCtxtPtr ctxt); + xmlParsePubidLiteral (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN void - xmlParseCharData (xmlParserCtxtPtr ctxt, + xmlParseCharData (xmlParserCtxt *ctxt, int cdata); XML_DEPRECATED XMLPUBFUN xmlChar * - xmlParseExternalID (xmlParserCtxtPtr ctxt, + xmlParseExternalID (xmlParserCtxt *ctxt, xmlChar **publicID, int strict); XML_DEPRECATED XMLPUBFUN void - xmlParseComment (xmlParserCtxtPtr ctxt); + xmlParseComment (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN const xmlChar * - xmlParsePITarget (xmlParserCtxtPtr ctxt); + xmlParsePITarget (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN void - xmlParsePI (xmlParserCtxtPtr ctxt); + xmlParsePI (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN void - xmlParseNotationDecl (xmlParserCtxtPtr ctxt); + xmlParseNotationDecl (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN void - xmlParseEntityDecl (xmlParserCtxtPtr ctxt); + xmlParseEntityDecl (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN int - xmlParseDefaultDecl (xmlParserCtxtPtr ctxt, + xmlParseDefaultDecl (xmlParserCtxt *ctxt, xmlChar **value); XML_DEPRECATED -XMLPUBFUN xmlEnumerationPtr - xmlParseNotationType (xmlParserCtxtPtr ctxt); +XMLPUBFUN xmlEnumeration * + xmlParseNotationType (xmlParserCtxt *ctxt); XML_DEPRECATED -XMLPUBFUN xmlEnumerationPtr - xmlParseEnumerationType (xmlParserCtxtPtr ctxt); +XMLPUBFUN xmlEnumeration * + xmlParseEnumerationType (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN int - xmlParseEnumeratedType (xmlParserCtxtPtr ctxt, - xmlEnumerationPtr *tree); + xmlParseEnumeratedType (xmlParserCtxt *ctxt, + xmlEnumeration **tree); XML_DEPRECATED XMLPUBFUN int - xmlParseAttributeType (xmlParserCtxtPtr ctxt, - xmlEnumerationPtr *tree); + xmlParseAttributeType (xmlParserCtxt *ctxt, + xmlEnumeration **tree); XML_DEPRECATED XMLPUBFUN void - xmlParseAttributeListDecl(xmlParserCtxtPtr ctxt); + xmlParseAttributeListDecl(xmlParserCtxt *ctxt); XML_DEPRECATED -XMLPUBFUN xmlElementContentPtr +XMLPUBFUN xmlElementContent * xmlParseElementMixedContentDecl - (xmlParserCtxtPtr ctxt, + (xmlParserCtxt *ctxt, int inputchk); XML_DEPRECATED -XMLPUBFUN xmlElementContentPtr +XMLPUBFUN xmlElementContent * xmlParseElementChildrenContentDecl - (xmlParserCtxtPtr ctxt, + (xmlParserCtxt *ctxt, int inputchk); XML_DEPRECATED XMLPUBFUN int - xmlParseElementContentDecl(xmlParserCtxtPtr ctxt, + xmlParseElementContentDecl(xmlParserCtxt *ctxt, const xmlChar *name, - xmlElementContentPtr *result); + xmlElementContent **result); XML_DEPRECATED XMLPUBFUN int - xmlParseElementDecl (xmlParserCtxtPtr ctxt); + xmlParseElementDecl (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN void - xmlParseMarkupDecl (xmlParserCtxtPtr ctxt); + xmlParseMarkupDecl (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN int - xmlParseCharRef (xmlParserCtxtPtr ctxt); + xmlParseCharRef (xmlParserCtxt *ctxt); XML_DEPRECATED -XMLPUBFUN xmlEntityPtr - xmlParseEntityRef (xmlParserCtxtPtr ctxt); +XMLPUBFUN xmlEntity * + xmlParseEntityRef (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN void - xmlParseReference (xmlParserCtxtPtr ctxt); + xmlParseReference (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN void - xmlParsePEReference (xmlParserCtxtPtr ctxt); + xmlParsePEReference (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN void - xmlParseDocTypeDecl (xmlParserCtxtPtr ctxt); + xmlParseDocTypeDecl (xmlParserCtxt *ctxt); #ifdef LIBXML_SAX1_ENABLED XML_DEPRECATED XMLPUBFUN const xmlChar * - xmlParseAttribute (xmlParserCtxtPtr ctxt, + xmlParseAttribute (xmlParserCtxt *ctxt, xmlChar **value); XML_DEPRECATED XMLPUBFUN const xmlChar * - xmlParseStartTag (xmlParserCtxtPtr ctxt); + xmlParseStartTag (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN void - xmlParseEndTag (xmlParserCtxtPtr ctxt); + xmlParseEndTag (xmlParserCtxt *ctxt); #endif /* LIBXML_SAX1_ENABLED */ XML_DEPRECATED XMLPUBFUN void - xmlParseCDSect (xmlParserCtxtPtr ctxt); + xmlParseCDSect (xmlParserCtxt *ctxt); XMLPUBFUN void - xmlParseContent (xmlParserCtxtPtr ctxt); + xmlParseContent (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN void - xmlParseElement (xmlParserCtxtPtr ctxt); + xmlParseElement (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN xmlChar * - xmlParseVersionNum (xmlParserCtxtPtr ctxt); + xmlParseVersionNum (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN xmlChar * - xmlParseVersionInfo (xmlParserCtxtPtr ctxt); + xmlParseVersionInfo (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN xmlChar * - xmlParseEncName (xmlParserCtxtPtr ctxt); + xmlParseEncName (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN const xmlChar * - xmlParseEncodingDecl (xmlParserCtxtPtr ctxt); + xmlParseEncodingDecl (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN int - xmlParseSDDecl (xmlParserCtxtPtr ctxt); + xmlParseSDDecl (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN void - xmlParseXMLDecl (xmlParserCtxtPtr ctxt); + xmlParseXMLDecl (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN void - xmlParseTextDecl (xmlParserCtxtPtr ctxt); + xmlParseTextDecl (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN void - xmlParseMisc (xmlParserCtxtPtr ctxt); + xmlParseMisc (xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN void - xmlParseExternalSubset (xmlParserCtxtPtr ctxt, + xmlParseExternalSubset (xmlParserCtxt *ctxt, const xmlChar *ExternalID, const xmlChar *SystemID); @@ -490,7 +490,7 @@ XMLPUBFUN void /** @endcond */ XML_DEPRECATED XMLPUBFUN xmlChar * - xmlStringDecodeEntities (xmlParserCtxtPtr ctxt, + xmlStringDecodeEntities (xmlParserCtxt *ctxt, const xmlChar *str, int what, xmlChar end, @@ -498,7 +498,7 @@ XMLPUBFUN xmlChar * xmlChar end3); XML_DEPRECATED XMLPUBFUN xmlChar * - xmlStringLenDecodeEntities (xmlParserCtxtPtr ctxt, + xmlStringLenDecodeEntities (xmlParserCtxt *ctxt, const xmlChar *str, int len, int what, @@ -510,13 +510,13 @@ XMLPUBFUN xmlChar * * other commodities shared between parser.c and parserInternals. */ XML_DEPRECATED -XMLPUBFUN int xmlSkipBlankChars (xmlParserCtxtPtr ctxt); +XMLPUBFUN int xmlSkipBlankChars (xmlParserCtxt *ctxt); XML_DEPRECATED -XMLPUBFUN int xmlStringCurrentChar (xmlParserCtxtPtr ctxt, +XMLPUBFUN int xmlStringCurrentChar (xmlParserCtxt *ctxt, const xmlChar *cur, int *len); XML_DEPRECATED -XMLPUBFUN void xmlParserHandlePEReference(xmlParserCtxtPtr ctxt); +XMLPUBFUN void xmlParserHandlePEReference(xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN int xmlCheckLanguageID (const xmlChar *lang); @@ -524,7 +524,7 @@ XMLPUBFUN int xmlCheckLanguageID (const xmlChar *lang); * Really core function shared with HTML parser. */ XML_DEPRECATED -XMLPUBFUN int xmlCurrentChar (xmlParserCtxtPtr ctxt, +XMLPUBFUN int xmlCurrentChar (xmlParserCtxt *ctxt, int *len); XML_DEPRECATED XMLPUBFUN int xmlCopyCharMultiByte (xmlChar *out, @@ -534,9 +534,9 @@ XMLPUBFUN int xmlCopyChar (int len, xmlChar *out, int val); XML_DEPRECATED -XMLPUBFUN void xmlNextChar (xmlParserCtxtPtr ctxt); +XMLPUBFUN void xmlNextChar (xmlParserCtxt *ctxt); XML_DEPRECATED -XMLPUBFUN void xmlParserInputShrink (xmlParserInputPtr in); +XMLPUBFUN void xmlParserInputShrink (xmlParserInput *in); #ifdef __cplusplus } diff --git a/include/libxml/pattern.h b/include/libxml/pattern.h index 075111b1..373aae94 100644 --- a/include/libxml/pattern.h +++ b/include/libxml/pattern.h @@ -42,12 +42,12 @@ typedef enum { } xmlPatternFlags; XMLPUBFUN void - xmlFreePattern (xmlPatternPtr comp); + xmlFreePattern (xmlPattern *comp); XMLPUBFUN void - xmlFreePatternList (xmlPatternPtr comp); + xmlFreePatternList (xmlPattern *comp); -XMLPUBFUN xmlPatternPtr +XMLPUBFUN xmlPattern * xmlPatterncompile (const xmlChar *pattern, xmlDict *dict, int flags, @@ -57,44 +57,44 @@ XMLPUBFUN int xmlDict *dict, int flags, const xmlChar **namespaces, - xmlPatternPtr *patternOut); + xmlPattern **patternOut); XMLPUBFUN int - xmlPatternMatch (xmlPatternPtr comp, - xmlNodePtr node); + xmlPatternMatch (xmlPattern *comp, + xmlNode *node); /* streaming interfaces */ typedef struct _xmlStreamCtxt xmlStreamCtxt; typedef xmlStreamCtxt *xmlStreamCtxtPtr; XMLPUBFUN int - xmlPatternStreamable (xmlPatternPtr comp); + xmlPatternStreamable (xmlPattern *comp); XMLPUBFUN int - xmlPatternMaxDepth (xmlPatternPtr comp); + xmlPatternMaxDepth (xmlPattern *comp); XMLPUBFUN int - xmlPatternMinDepth (xmlPatternPtr comp); + xmlPatternMinDepth (xmlPattern *comp); XMLPUBFUN int - xmlPatternFromRoot (xmlPatternPtr comp); -XMLPUBFUN xmlStreamCtxtPtr - xmlPatternGetStreamCtxt (xmlPatternPtr comp); + xmlPatternFromRoot (xmlPattern *comp); +XMLPUBFUN xmlStreamCtxt * + xmlPatternGetStreamCtxt (xmlPattern *comp); XMLPUBFUN void - xmlFreeStreamCtxt (xmlStreamCtxtPtr stream); + xmlFreeStreamCtxt (xmlStreamCtxt *stream); XMLPUBFUN int - xmlStreamPushNode (xmlStreamCtxtPtr stream, + xmlStreamPushNode (xmlStreamCtxt *stream, const xmlChar *name, const xmlChar *ns, int nodeType); XMLPUBFUN int - xmlStreamPush (xmlStreamCtxtPtr stream, + xmlStreamPush (xmlStreamCtxt *stream, const xmlChar *name, const xmlChar *ns); XMLPUBFUN int - xmlStreamPushAttr (xmlStreamCtxtPtr stream, + xmlStreamPushAttr (xmlStreamCtxt *stream, const xmlChar *name, const xmlChar *ns); XMLPUBFUN int - xmlStreamPop (xmlStreamCtxtPtr stream); + xmlStreamPop (xmlStreamCtxt *stream); XMLPUBFUN int - xmlStreamWantsAnyNode (xmlStreamCtxtPtr stream); + xmlStreamWantsAnyNode (xmlStreamCtxt *stream); #ifdef __cplusplus } #endif diff --git a/include/libxml/relaxng.h b/include/libxml/relaxng.h index 86fe6d33..2a142c71 100644 --- a/include/libxml/relaxng.h +++ b/include/libxml/relaxng.h @@ -124,93 +124,93 @@ XMLPUBFUN void /* * Interfaces for parsing. */ -XMLPUBFUN xmlRelaxNGParserCtxtPtr +XMLPUBFUN xmlRelaxNGParserCtxt * xmlRelaxNGNewParserCtxt (const char *URL); -XMLPUBFUN xmlRelaxNGParserCtxtPtr +XMLPUBFUN xmlRelaxNGParserCtxt * xmlRelaxNGNewMemParserCtxt (const char *buffer, int size); -XMLPUBFUN xmlRelaxNGParserCtxtPtr - xmlRelaxNGNewDocParserCtxt (xmlDocPtr doc); +XMLPUBFUN xmlRelaxNGParserCtxt * + xmlRelaxNGNewDocParserCtxt (xmlDoc *doc); XMLPUBFUN int - xmlRelaxParserSetFlag (xmlRelaxNGParserCtxtPtr ctxt, + xmlRelaxParserSetFlag (xmlRelaxNGParserCtxt *ctxt, int flag); XMLPUBFUN void - xmlRelaxNGFreeParserCtxt (xmlRelaxNGParserCtxtPtr ctxt); + xmlRelaxNGFreeParserCtxt (xmlRelaxNGParserCtxt *ctxt); XMLPUBFUN void - xmlRelaxNGSetParserErrors(xmlRelaxNGParserCtxtPtr ctxt, + xmlRelaxNGSetParserErrors(xmlRelaxNGParserCtxt *ctxt, xmlRelaxNGValidityErrorFunc err, xmlRelaxNGValidityWarningFunc warn, void *ctx); XMLPUBFUN int - xmlRelaxNGGetParserErrors(xmlRelaxNGParserCtxtPtr ctxt, + xmlRelaxNGGetParserErrors(xmlRelaxNGParserCtxt *ctxt, xmlRelaxNGValidityErrorFunc *err, xmlRelaxNGValidityWarningFunc *warn, void **ctx); XMLPUBFUN void xmlRelaxNGSetParserStructuredErrors( - xmlRelaxNGParserCtxtPtr ctxt, + xmlRelaxNGParserCtxt *ctxt, xmlStructuredErrorFunc serror, void *ctx); XMLPUBFUN void - xmlRelaxNGSetResourceLoader (xmlRelaxNGParserCtxtPtr ctxt, + xmlRelaxNGSetResourceLoader (xmlRelaxNGParserCtxt *ctxt, xmlResourceLoader loader, void *vctxt); -XMLPUBFUN xmlRelaxNGPtr - xmlRelaxNGParse (xmlRelaxNGParserCtxtPtr ctxt); +XMLPUBFUN xmlRelaxNG * + xmlRelaxNGParse (xmlRelaxNGParserCtxt *ctxt); XMLPUBFUN void - xmlRelaxNGFree (xmlRelaxNGPtr schema); + xmlRelaxNGFree (xmlRelaxNG *schema); #ifdef LIBXML_OUTPUT_ENABLED XMLPUBFUN void xmlRelaxNGDump (FILE *output, - xmlRelaxNGPtr schema); + xmlRelaxNG *schema); XMLPUBFUN void xmlRelaxNGDumpTree (FILE * output, - xmlRelaxNGPtr schema); + xmlRelaxNG *schema); #endif /* LIBXML_OUTPUT_ENABLED */ /* * Interfaces for validating */ XMLPUBFUN void - xmlRelaxNGSetValidErrors(xmlRelaxNGValidCtxtPtr ctxt, + xmlRelaxNGSetValidErrors(xmlRelaxNGValidCtxt *ctxt, xmlRelaxNGValidityErrorFunc err, xmlRelaxNGValidityWarningFunc warn, void *ctx); XMLPUBFUN int - xmlRelaxNGGetValidErrors(xmlRelaxNGValidCtxtPtr ctxt, + xmlRelaxNGGetValidErrors(xmlRelaxNGValidCtxt *ctxt, xmlRelaxNGValidityErrorFunc *err, xmlRelaxNGValidityWarningFunc *warn, void **ctx); XMLPUBFUN void - xmlRelaxNGSetValidStructuredErrors(xmlRelaxNGValidCtxtPtr ctxt, + xmlRelaxNGSetValidStructuredErrors(xmlRelaxNGValidCtxt *ctxt, xmlStructuredErrorFunc serror, void *ctx); -XMLPUBFUN xmlRelaxNGValidCtxtPtr - xmlRelaxNGNewValidCtxt (xmlRelaxNGPtr schema); +XMLPUBFUN xmlRelaxNGValidCtxt * + xmlRelaxNGNewValidCtxt (xmlRelaxNG *schema); XMLPUBFUN void - xmlRelaxNGFreeValidCtxt (xmlRelaxNGValidCtxtPtr ctxt); + xmlRelaxNGFreeValidCtxt (xmlRelaxNGValidCtxt *ctxt); XMLPUBFUN int - xmlRelaxNGValidateDoc (xmlRelaxNGValidCtxtPtr ctxt, - xmlDocPtr doc); + xmlRelaxNGValidateDoc (xmlRelaxNGValidCtxt *ctxt, + xmlDoc *doc); /* * Interfaces for progressive validation when possible */ XMLPUBFUN int - xmlRelaxNGValidatePushElement (xmlRelaxNGValidCtxtPtr ctxt, - xmlDocPtr doc, - xmlNodePtr elem); + xmlRelaxNGValidatePushElement (xmlRelaxNGValidCtxt *ctxt, + xmlDoc *doc, + xmlNode *elem); XMLPUBFUN int - xmlRelaxNGValidatePushCData (xmlRelaxNGValidCtxtPtr ctxt, + xmlRelaxNGValidatePushCData (xmlRelaxNGValidCtxt *ctxt, const xmlChar *data, int len); XMLPUBFUN int - xmlRelaxNGValidatePopElement (xmlRelaxNGValidCtxtPtr ctxt, - xmlDocPtr doc, - xmlNodePtr elem); + xmlRelaxNGValidatePopElement (xmlRelaxNGValidCtxt *ctxt, + xmlDoc *doc, + xmlNode *elem); XMLPUBFUN int - xmlRelaxNGValidateFullElement (xmlRelaxNGValidCtxtPtr ctxt, - xmlDocPtr doc, - xmlNodePtr elem); + xmlRelaxNGValidateFullElement (xmlRelaxNGValidCtxt *ctxt, + xmlDoc *doc, + xmlNode *elem); #ifdef __cplusplus } diff --git a/include/libxml/schemasInternals.h b/include/libxml/schemasInternals.h index 190783f3..27926971 100644 --- a/include/libxml/schemasInternals.h +++ b/include/libxml/schemasInternals.h @@ -159,7 +159,7 @@ typedef xmlSchemaAnnot *xmlSchemaAnnotPtr; */ struct _xmlSchemaAnnot { struct _xmlSchemaAnnot *next; - xmlNodePtr content; /* the annotation */ + xmlNode *content; /* the annotation */ }; /** @@ -236,18 +236,18 @@ struct _xmlSchemaAttribute { const xmlChar *refNs; /* Deprecated; not used */ const xmlChar *typeName; /* the local name of the type definition */ const xmlChar *typeNs; /* the ns URI of the type definition */ - xmlSchemaAnnotPtr annot; + xmlSchemaAnnot *annot; - xmlSchemaTypePtr base; /* Deprecated; not used */ + xmlSchemaType *base; /* Deprecated; not used */ int occurs; /* Deprecated; not used */ const xmlChar *defValue; /* The initial value of the value constraint */ - xmlSchemaTypePtr subtypes; /* the type definition */ - xmlNodePtr node; + xmlSchemaType *subtypes; /* the type definition */ + xmlNode *node; const xmlChar *targetNamespace; int flags; const xmlChar *refPrefix; /* Deprecated; not used */ - xmlSchemaValPtr defVal; /* The compiled value constraint */ - xmlSchemaAttributePtr refDecl; /* Deprecated; not used */ + xmlSchemaVal *defVal; /* The compiled value constraint */ + xmlSchemaAttribute *refDecl; /* Deprecated; not used */ }; typedef struct _xmlSchemaAttributeLink xmlSchemaAttributeLink; @@ -284,14 +284,14 @@ typedef xmlSchemaWildcard *xmlSchemaWildcardPtr; struct _xmlSchemaWildcard { xmlSchemaTypeType type; /* The kind of type */ const xmlChar *id; /* Deprecated; not used */ - xmlSchemaAnnotPtr annot; - xmlNodePtr node; + xmlSchemaAnnot *annot; + xmlNode *node; int minOccurs; /* Deprecated; not used */ int maxOccurs; /* Deprecated; not used */ int processContents; int any; /* Indicates if the ns constraint is of ##any */ - xmlSchemaWildcardNsPtr nsSet; /* The list of allowed namespaces */ - xmlSchemaWildcardNsPtr negNsSet; /* The negated namespace */ + xmlSchemaWildcardNs *nsSet; /* The list of allowed namespaces */ + xmlSchemaWildcardNs *negNsSet; /* The negated namespace */ int flags; }; @@ -332,14 +332,14 @@ struct _xmlSchemaAttributeGroup { const xmlChar *id; const xmlChar *ref; /* Deprecated; not used */ const xmlChar *refNs; /* Deprecated; not used */ - xmlSchemaAnnotPtr annot; + xmlSchemaAnnot *annot; - xmlSchemaAttributePtr attributes; /* Deprecated; not used */ - xmlNodePtr node; + xmlSchemaAttribute *attributes; /* Deprecated; not used */ + xmlNode *node; int flags; - xmlSchemaWildcardPtr attributeWildcard; + xmlSchemaWildcard *attributeWildcard; const xmlChar *refPrefix; /* Deprecated; not used */ - xmlSchemaAttributeGroupPtr refItem; /* Deprecated; not used */ + xmlSchemaAttributeGroup *refItem; /* Deprecated; not used */ const xmlChar *targetNamespace; void *attrUses; }; @@ -352,7 +352,7 @@ typedef xmlSchemaTypeLink *xmlSchemaTypeLinkPtr; */ struct _xmlSchemaTypeLink { struct _xmlSchemaTypeLink *next;/* the next type link ... */ - xmlSchemaTypePtr type;/* the linked type */ + xmlSchemaType *type;/* the linked type */ }; typedef struct _xmlSchemaFacetLink xmlSchemaFacetLink; @@ -362,7 +362,7 @@ typedef xmlSchemaFacetLink *xmlSchemaFacetLinkPtr; */ struct _xmlSchemaFacetLink { struct _xmlSchemaFacetLink *next;/* the next facet link ... */ - xmlSchemaFacetPtr facet;/* the linked facet */ + xmlSchemaFacet *facet;/* the linked facet */ }; /** @@ -509,10 +509,10 @@ struct _xmlSchemaType { const xmlChar *id ; /* Deprecated; not used */ const xmlChar *ref; /* Deprecated; not used */ const xmlChar *refNs; /* Deprecated; not used */ - xmlSchemaAnnotPtr annot; - xmlSchemaTypePtr subtypes; - xmlSchemaAttributePtr attributes; /* Deprecated; not used */ - xmlNodePtr node; + xmlSchemaAnnot *annot; + xmlSchemaType *subtypes; + xmlSchemaAttribute *attributes; /* Deprecated; not used */ + xmlNode *node; int minOccurs; /* Deprecated; not used */ int maxOccurs; /* Deprecated; not used */ @@ -520,19 +520,19 @@ struct _xmlSchemaType { xmlSchemaContentType contentType; const xmlChar *base; /* Base type's local name */ const xmlChar *baseNs; /* Base type's target namespace */ - xmlSchemaTypePtr baseType; /* The base type component */ - xmlSchemaFacetPtr facets; /* Local facets */ + xmlSchemaType *baseType; /* The base type component */ + xmlSchemaFacet *facets; /* Local facets */ struct _xmlSchemaType *redef; /* Deprecated; not used */ int recurse; /* Obsolete */ - xmlSchemaAttributeLinkPtr *attributeUses; /* Deprecated; not used */ - xmlSchemaWildcardPtr attributeWildcard; + xmlSchemaAttributeLink **attributeUses; /* Deprecated; not used */ + xmlSchemaWildcard *attributeWildcard; int builtInType; /* Type of built-in types. */ - xmlSchemaTypeLinkPtr memberTypes; /* member-types if a union type. */ - xmlSchemaFacetLinkPtr facetSet; /* All facets (incl. inherited) */ + xmlSchemaTypeLink *memberTypes; /* member-types if a union type. */ + xmlSchemaFacetLink *facetSet; /* All facets (incl. inherited) */ const xmlChar *refPrefix; /* Deprecated; not used */ - xmlSchemaTypePtr contentTypeDef; /* Used for the simple content of complex types. + xmlSchemaType *contentTypeDef; /* Used for the simple content of complex types. Could we use @subtypes for this? */ - xmlRegexpPtr contModel; /* Holds the automaton of the content model */ + xmlRegexp *contModel; /* Holds the automaton of the content model */ const xmlChar *targetNamespace; void *attrUses; }; @@ -633,10 +633,10 @@ struct _xmlSchemaElement { const xmlChar *id; /* Deprecated; not used */ const xmlChar *ref; /* Deprecated; not used */ const xmlChar *refNs; /* Deprecated; not used */ - xmlSchemaAnnotPtr annot; - xmlSchemaTypePtr subtypes; /* the type definition */ - xmlSchemaAttributePtr attributes; - xmlNodePtr node; + xmlSchemaAnnot *annot; + xmlSchemaType *subtypes; /* the type definition */ + xmlSchemaAttribute *attributes; + xmlNode *node; int minOccurs; /* Deprecated; not used */ int maxOccurs; /* Deprecated; not used */ @@ -650,10 +650,10 @@ struct _xmlSchemaElement { const xmlChar *value; /* The original value of the value constraint. */ struct _xmlSchemaElement *refDecl; /* This will now be used for the substitution group affiliation */ - xmlRegexpPtr contModel; /* Obsolete for WXS, maybe used for RelaxNG */ + xmlRegexp *contModel; /* Obsolete for WXS, maybe used for RelaxNG */ xmlSchemaContentType contentType; const xmlChar *refPrefix; /* Deprecated; not used */ - xmlSchemaValPtr defVal; /* The compiled value constraint. */ + xmlSchemaVal *defVal; /* The compiled value constraint. */ void *idcs; /* The identity-constraint defs */ }; @@ -681,12 +681,12 @@ struct _xmlSchemaFacet { struct _xmlSchemaFacet *next;/* the next type if in a sequence ... */ const xmlChar *value; /* The original value */ const xmlChar *id; /* Obsolete */ - xmlSchemaAnnotPtr annot; - xmlNodePtr node; + xmlSchemaAnnot *annot; + xmlNode *node; int fixed; /* XML_SCHEMAS_FACET_PRESERVE, etc. */ int whitespace; - xmlSchemaValPtr val; /* The compiled value */ - xmlRegexpPtr regexp; /* The regex for patterns */ + xmlSchemaVal *val; /* The compiled value */ + xmlRegexp *regexp; /* The regex for patterns */ }; typedef struct _xmlSchemaNotation xmlSchemaNotation; @@ -697,7 +697,7 @@ typedef xmlSchemaNotation *xmlSchemaNotationPtr; struct _xmlSchemaNotation { xmlSchemaTypeType type; /* The kind of type */ const xmlChar *name; - xmlSchemaAnnotPtr annot; + xmlSchemaAnnot *annot; const xmlChar *identifier; const xmlChar *targetNamespace; }; @@ -759,30 +759,30 @@ struct _xmlSchema { const xmlChar *targetNamespace; /* the target namespace */ const xmlChar *version; const xmlChar *id; /* Obsolete */ - xmlDocPtr doc; - xmlSchemaAnnotPtr annot; + xmlDoc *doc; + xmlSchemaAnnot *annot; int flags; - xmlHashTablePtr typeDecl; - xmlHashTablePtr attrDecl; - xmlHashTablePtr attrgrpDecl; - xmlHashTablePtr elemDecl; - xmlHashTablePtr notaDecl; + xmlHashTable *typeDecl; + xmlHashTable *attrDecl; + xmlHashTable *attrgrpDecl; + xmlHashTable *elemDecl; + xmlHashTable *notaDecl; - xmlHashTablePtr schemasImports; + xmlHashTable *schemasImports; void *_private; /* unused by the library for users or bindings */ - xmlHashTablePtr groupDecl; - xmlDictPtr dict; + xmlHashTable *groupDecl; + xmlDict *dict; void *includes; /* the includes, this is opaque for now */ int preserve; /* whether to free the document */ int counter; /* used to give anonymous components unique names */ - xmlHashTablePtr idcDef; /* All identity-constraint defs. */ + xmlHashTable *idcDef; /* All identity-constraint defs. */ void *volatiles; /* Obsolete */ }; -XMLPUBFUN void xmlSchemaFreeType (xmlSchemaTypePtr type); -XMLPUBFUN void xmlSchemaFreeWildcard(xmlSchemaWildcardPtr wildcard); +XMLPUBFUN void xmlSchemaFreeType (xmlSchemaType *type); +XMLPUBFUN void xmlSchemaFreeWildcard(xmlSchemaWildcard *wildcard); #ifdef __cplusplus } diff --git a/include/libxml/schematron.h b/include/libxml/schematron.h index 48cea6de..4fcf9716 100644 --- a/include/libxml/schematron.h +++ b/include/libxml/schematron.h @@ -81,70 +81,70 @@ typedef xmlSchematronValidCtxt *xmlSchematronValidCtxtPtr; /* * Interfaces for parsing. */ -XMLPUBFUN xmlSchematronParserCtxtPtr +XMLPUBFUN xmlSchematronParserCtxt * xmlSchematronNewParserCtxt (const char *URL); -XMLPUBFUN xmlSchematronParserCtxtPtr +XMLPUBFUN xmlSchematronParserCtxt * xmlSchematronNewMemParserCtxt(const char *buffer, int size); -XMLPUBFUN xmlSchematronParserCtxtPtr - xmlSchematronNewDocParserCtxt(xmlDocPtr doc); +XMLPUBFUN xmlSchematronParserCtxt * + xmlSchematronNewDocParserCtxt(xmlDoc *doc); XMLPUBFUN void - xmlSchematronFreeParserCtxt (xmlSchematronParserCtxtPtr ctxt); + xmlSchematronFreeParserCtxt (xmlSchematronParserCtxt *ctxt); /***** XMLPUBFUN void - xmlSchematronSetParserErrors(xmlSchematronParserCtxtPtr ctxt, + xmlSchematronSetParserErrors(xmlSchematronParserCtxt *ctxt, xmlSchematronValidityErrorFunc err, xmlSchematronValidityWarningFunc warn, void *ctx); XMLPUBFUN int - xmlSchematronGetParserErrors(xmlSchematronParserCtxtPtr ctxt, + xmlSchematronGetParserErrors(xmlSchematronParserCtxt *ctxt, xmlSchematronValidityErrorFunc * err, xmlSchematronValidityWarningFunc * warn, void **ctx); XMLPUBFUN int - xmlSchematronIsValid (xmlSchematronValidCtxtPtr ctxt); + xmlSchematronIsValid (xmlSchematronValidCtxt *ctxt); *****/ -XMLPUBFUN xmlSchematronPtr - xmlSchematronParse (xmlSchematronParserCtxtPtr ctxt); +XMLPUBFUN xmlSchematron * + xmlSchematronParse (xmlSchematronParserCtxt *ctxt); XMLPUBFUN void - xmlSchematronFree (xmlSchematronPtr schema); + xmlSchematronFree (xmlSchematron *schema); /* * Interfaces for validating */ XMLPUBFUN void xmlSchematronSetValidStructuredErrors( - xmlSchematronValidCtxtPtr ctxt, + xmlSchematronValidCtxt *ctxt, xmlStructuredErrorFunc serror, void *ctx); /****** XMLPUBFUN void - xmlSchematronSetValidErrors (xmlSchematronValidCtxtPtr ctxt, + xmlSchematronSetValidErrors (xmlSchematronValidCtxt *ctxt, xmlSchematronValidityErrorFunc err, xmlSchematronValidityWarningFunc warn, void *ctx); XMLPUBFUN int - xmlSchematronGetValidErrors (xmlSchematronValidCtxtPtr ctxt, + xmlSchematronGetValidErrors (xmlSchematronValidCtxt *ctxt, xmlSchematronValidityErrorFunc *err, xmlSchematronValidityWarningFunc *warn, void **ctx); XMLPUBFUN int - xmlSchematronSetValidOptions(xmlSchematronValidCtxtPtr ctxt, + xmlSchematronSetValidOptions(xmlSchematronValidCtxt *ctxt, int options); XMLPUBFUN int - xmlSchematronValidCtxtGetOptions(xmlSchematronValidCtxtPtr ctxt); + xmlSchematronValidCtxtGetOptions(xmlSchematronValidCtxt *ctxt); XMLPUBFUN int - xmlSchematronValidateOneElement (xmlSchematronValidCtxtPtr ctxt, - xmlNodePtr elem); + xmlSchematronValidateOneElement (xmlSchematronValidCtxt *ctxt, + xmlNode *elem); *******/ -XMLPUBFUN xmlSchematronValidCtxtPtr - xmlSchematronNewValidCtxt (xmlSchematronPtr schema, +XMLPUBFUN xmlSchematronValidCtxt * + xmlSchematronNewValidCtxt (xmlSchematron *schema, int options); XMLPUBFUN void - xmlSchematronFreeValidCtxt (xmlSchematronValidCtxtPtr ctxt); + xmlSchematronFreeValidCtxt (xmlSchematronValidCtxt *ctxt); XMLPUBFUN int - xmlSchematronValidateDoc (xmlSchematronValidCtxtPtr ctxt, - xmlDocPtr instance); + xmlSchematronValidateDoc (xmlSchematronValidCtxt *ctxt, + xmlDoc *instance); #ifdef __cplusplus } diff --git a/include/libxml/threads.h b/include/libxml/threads.h index 25719a26..15f5cabc 100644 --- a/include/libxml/threads.h +++ b/include/libxml/threads.h @@ -35,23 +35,23 @@ typedef xmlRMutex *xmlRMutexPtr; XMLPUBFUN int xmlCheckThreadLocalStorage(void); -XMLPUBFUN xmlMutexPtr +XMLPUBFUN xmlMutex * xmlNewMutex (void); XMLPUBFUN void - xmlMutexLock (xmlMutexPtr tok); + xmlMutexLock (xmlMutex *tok); XMLPUBFUN void - xmlMutexUnlock (xmlMutexPtr tok); + xmlMutexUnlock (xmlMutex *tok); XMLPUBFUN void - xmlFreeMutex (xmlMutexPtr tok); + xmlFreeMutex (xmlMutex *tok); -XMLPUBFUN xmlRMutexPtr +XMLPUBFUN xmlRMutex * xmlNewRMutex (void); XMLPUBFUN void - xmlRMutexLock (xmlRMutexPtr tok); + xmlRMutexLock (xmlRMutex *tok); XMLPUBFUN void - xmlRMutexUnlock (xmlRMutexPtr tok); + xmlRMutexUnlock (xmlRMutex *tok); XMLPUBFUN void - xmlFreeRMutex (xmlRMutexPtr tok); + xmlFreeRMutex (xmlRMutex *tok); /* * Library wide APIs. diff --git a/include/libxml/tree.h b/include/libxml/tree.h index 1e138909..b3784d3f 100644 --- a/include/libxml/tree.h +++ b/include/libxml/tree.h @@ -273,7 +273,7 @@ struct _xmlAttribute { /** default value */ const xmlChar *defaultValue; /** enumeration tree if any */ - xmlEnumerationPtr tree; + xmlEnumeration *tree; /** namespace prefix if any */ const xmlChar *prefix; /** element name */ @@ -362,14 +362,14 @@ struct _xmlElement { /** element type */ xmlElementTypeVal etype; /** allowed element content */ - xmlElementContentPtr content; + xmlElementContent *content; /** list of declared attributes */ - xmlAttributePtr attributes; + xmlAttribute *attributes; /** namespace prefix if any */ const xmlChar *prefix; #ifdef LIBXML_REGEXP_ENABLED /** validating regexp */ - xmlRegexpPtr contModel; + xmlRegexp *contModel; #else void *contModel; #endif @@ -499,7 +499,7 @@ struct _xmlID { /* The ID name */ const xmlChar *value; /* The attribute holding it */ - xmlAttrPtr attr; + xmlAttr *attr; /* The attribute if attr is not available */ const xmlChar *name; /* The line number if attr is not available */ @@ -517,7 +517,7 @@ typedef xmlRef *xmlRefPtr; struct _xmlRef { struct _xmlRef *next; /* next Ref */ const xmlChar *value; /* The Ref name */ - xmlAttrPtr attr; /* The attribute holding it */ + xmlAttr *attr; /* The attribute holding it */ const xmlChar *name; /* The attribute if attr is not available */ int lineno; /* The line number if attr is not available */ }; @@ -678,10 +678,10 @@ typedef xmlDOMWrapCtxt *xmlDOMWrapCtxtPtr; * @param node the context node (element or attribute) * @param nsName the requested namespace name * @param nsPrefix the requested namespace prefix - * @returns an xmlNsPtr or NULL in case of an error. + * @returns an xmlNs or NULL in case of an error. */ -typedef xmlNsPtr (*xmlDOMWrapAcquireNsFunction) (xmlDOMWrapCtxtPtr ctxt, - xmlNodePtr node, +typedef xmlNs *(*xmlDOMWrapAcquireNsFunction) (xmlDOMWrapCtxt *ctxt, + xmlNode *node, const xmlChar *nsName, const xmlChar *nsPrefix); @@ -700,7 +700,7 @@ struct _xmlDOMWrapCtxt { */ void * namespaceMap; /* - * Use this one to acquire an xmlNsPtr intended for node->ns. + * Use this one to acquire an xmlNs intended for node->ns. * (Note that this is not intended for elem->nsDef). */ xmlDOMWrapAcquireNsFunction getNsForNodeFunc; @@ -711,14 +711,14 @@ struct _xmlDOMWrapCtxt { * * @param node the current node */ -typedef void (*xmlRegisterNodeFunc) (xmlNodePtr node); +typedef void (*xmlRegisterNodeFunc) (xmlNode *node); /** * Signature for the deregistration callback of a discarded node * * @param node the current node */ -typedef void (*xmlDeregisterNodeFunc) (xmlNodePtr node); +typedef void (*xmlDeregisterNodeFunc) (xmlNode *node); /** * Macro for compatibility naming layer with libxml1. Maps @@ -788,147 +788,147 @@ XMLPUBFUN const xmlChar * /* * Creating/freeing new structures. */ -XMLPUBFUN xmlDtdPtr - xmlCreateIntSubset (xmlDocPtr doc, +XMLPUBFUN xmlDtd * + xmlCreateIntSubset (xmlDoc *doc, const xmlChar *name, const xmlChar *ExternalID, const xmlChar *SystemID); -XMLPUBFUN xmlDtdPtr - xmlNewDtd (xmlDocPtr doc, +XMLPUBFUN xmlDtd * + xmlNewDtd (xmlDoc *doc, const xmlChar *name, const xmlChar *ExternalID, const xmlChar *SystemID); -XMLPUBFUN xmlDtdPtr +XMLPUBFUN xmlDtd * xmlGetIntSubset (const xmlDoc *doc); XMLPUBFUN void - xmlFreeDtd (xmlDtdPtr cur); -XMLPUBFUN xmlNsPtr - xmlNewNs (xmlNodePtr node, + xmlFreeDtd (xmlDtd *cur); +XMLPUBFUN xmlNs * + xmlNewNs (xmlNode *node, const xmlChar *href, const xmlChar *prefix); XMLPUBFUN void - xmlFreeNs (xmlNsPtr cur); + xmlFreeNs (xmlNs *cur); XMLPUBFUN void - xmlFreeNsList (xmlNsPtr cur); -XMLPUBFUN xmlDocPtr + xmlFreeNsList (xmlNs *cur); +XMLPUBFUN xmlDoc * xmlNewDoc (const xmlChar *version); XMLPUBFUN void - xmlFreeDoc (xmlDocPtr cur); -XMLPUBFUN xmlAttrPtr - xmlNewDocProp (xmlDocPtr doc, + xmlFreeDoc (xmlDoc *cur); +XMLPUBFUN xmlAttr * + xmlNewDocProp (xmlDoc *doc, const xmlChar *name, const xmlChar *value); -XMLPUBFUN xmlAttrPtr - xmlNewProp (xmlNodePtr node, +XMLPUBFUN xmlAttr * + xmlNewProp (xmlNode *node, const xmlChar *name, const xmlChar *value); -XMLPUBFUN xmlAttrPtr - xmlNewNsProp (xmlNodePtr node, - xmlNsPtr ns, +XMLPUBFUN xmlAttr * + xmlNewNsProp (xmlNode *node, + xmlNs *ns, const xmlChar *name, const xmlChar *value); -XMLPUBFUN xmlAttrPtr - xmlNewNsPropEatName (xmlNodePtr node, - xmlNsPtr ns, +XMLPUBFUN xmlAttr * + xmlNewNsPropEatName (xmlNode *node, + xmlNs *ns, xmlChar *name, const xmlChar *value); XMLPUBFUN void - xmlFreePropList (xmlAttrPtr cur); + xmlFreePropList (xmlAttr *cur); XMLPUBFUN void - xmlFreeProp (xmlAttrPtr cur); -XMLPUBFUN xmlAttrPtr - xmlCopyProp (xmlNodePtr target, - xmlAttrPtr cur); -XMLPUBFUN xmlAttrPtr - xmlCopyPropList (xmlNodePtr target, - xmlAttrPtr cur); -XMLPUBFUN xmlDtdPtr - xmlCopyDtd (xmlDtdPtr dtd); -XMLPUBFUN xmlDocPtr - xmlCopyDoc (xmlDocPtr doc, + xmlFreeProp (xmlAttr *cur); +XMLPUBFUN xmlAttr * + xmlCopyProp (xmlNode *target, + xmlAttr *cur); +XMLPUBFUN xmlAttr * + xmlCopyPropList (xmlNode *target, + xmlAttr *cur); +XMLPUBFUN xmlDtd * + xmlCopyDtd (xmlDtd *dtd); +XMLPUBFUN xmlDoc * + xmlCopyDoc (xmlDoc *doc, int recursive); /* * Creating new nodes. */ -XMLPUBFUN xmlNodePtr - xmlNewDocNode (xmlDocPtr doc, - xmlNsPtr ns, +XMLPUBFUN xmlNode * + xmlNewDocNode (xmlDoc *doc, + xmlNs *ns, const xmlChar *name, const xmlChar *content); -XMLPUBFUN xmlNodePtr - xmlNewDocNodeEatName (xmlDocPtr doc, - xmlNsPtr ns, +XMLPUBFUN xmlNode * + xmlNewDocNodeEatName (xmlDoc *doc, + xmlNs *ns, xmlChar *name, const xmlChar *content); -XMLPUBFUN xmlNodePtr - xmlNewNode (xmlNsPtr ns, +XMLPUBFUN xmlNode * + xmlNewNode (xmlNs *ns, const xmlChar *name); -XMLPUBFUN xmlNodePtr - xmlNewNodeEatName (xmlNsPtr ns, +XMLPUBFUN xmlNode * + xmlNewNodeEatName (xmlNs *ns, xmlChar *name); -XMLPUBFUN xmlNodePtr - xmlNewChild (xmlNodePtr parent, - xmlNsPtr ns, +XMLPUBFUN xmlNode * + xmlNewChild (xmlNode *parent, + xmlNs *ns, const xmlChar *name, const xmlChar *content); -XMLPUBFUN xmlNodePtr +XMLPUBFUN xmlNode * xmlNewDocText (const xmlDoc *doc, const xmlChar *content); -XMLPUBFUN xmlNodePtr +XMLPUBFUN xmlNode * xmlNewText (const xmlChar *content); -XMLPUBFUN xmlNodePtr - xmlNewDocPI (xmlDocPtr doc, +XMLPUBFUN xmlNode * + xmlNewDocPI (xmlDoc *doc, const xmlChar *name, const xmlChar *content); -XMLPUBFUN xmlNodePtr +XMLPUBFUN xmlNode * xmlNewPI (const xmlChar *name, const xmlChar *content); -XMLPUBFUN xmlNodePtr - xmlNewDocTextLen (xmlDocPtr doc, +XMLPUBFUN xmlNode * + xmlNewDocTextLen (xmlDoc *doc, const xmlChar *content, int len); -XMLPUBFUN xmlNodePtr +XMLPUBFUN xmlNode * xmlNewTextLen (const xmlChar *content, int len); -XMLPUBFUN xmlNodePtr - xmlNewDocComment (xmlDocPtr doc, +XMLPUBFUN xmlNode * + xmlNewDocComment (xmlDoc *doc, const xmlChar *content); -XMLPUBFUN xmlNodePtr +XMLPUBFUN xmlNode * xmlNewComment (const xmlChar *content); -XMLPUBFUN xmlNodePtr - xmlNewCDataBlock (xmlDocPtr doc, +XMLPUBFUN xmlNode * + xmlNewCDataBlock (xmlDoc *doc, const xmlChar *content, int len); -XMLPUBFUN xmlNodePtr - xmlNewCharRef (xmlDocPtr doc, +XMLPUBFUN xmlNode * + xmlNewCharRef (xmlDoc *doc, const xmlChar *name); -XMLPUBFUN xmlNodePtr +XMLPUBFUN xmlNode * xmlNewReference (const xmlDoc *doc, const xmlChar *name); -XMLPUBFUN xmlNodePtr - xmlCopyNode (xmlNodePtr node, +XMLPUBFUN xmlNode * + xmlCopyNode (xmlNode *node, int recursive); -XMLPUBFUN xmlNodePtr - xmlDocCopyNode (xmlNodePtr node, - xmlDocPtr doc, +XMLPUBFUN xmlNode * + xmlDocCopyNode (xmlNode *node, + xmlDoc *doc, int recursive); -XMLPUBFUN xmlNodePtr - xmlDocCopyNodeList (xmlDocPtr doc, - xmlNodePtr node); -XMLPUBFUN xmlNodePtr - xmlCopyNodeList (xmlNodePtr node); -XMLPUBFUN xmlNodePtr - xmlNewTextChild (xmlNodePtr parent, - xmlNsPtr ns, +XMLPUBFUN xmlNode * + xmlDocCopyNodeList (xmlDoc *doc, + xmlNode *node); +XMLPUBFUN xmlNode * + xmlCopyNodeList (xmlNode *node); +XMLPUBFUN xmlNode * + xmlNewTextChild (xmlNode *parent, + xmlNs *ns, const xmlChar *name, const xmlChar *content); -XMLPUBFUN xmlNodePtr - xmlNewDocRawNode (xmlDocPtr doc, - xmlNsPtr ns, +XMLPUBFUN xmlNode * + xmlNewDocRawNode (xmlDoc *doc, + xmlNs *ns, const xmlChar *name, const xmlChar *content); -XMLPUBFUN xmlNodePtr - xmlNewDocFragment (xmlDocPtr doc); +XMLPUBFUN xmlNode * + xmlNewDocFragment (xmlDoc *doc); /* * Navigating. @@ -937,9 +937,9 @@ XMLPUBFUN long xmlGetLineNo (const xmlNode *node); XMLPUBFUN xmlChar * xmlGetNodePath (const xmlNode *node); -XMLPUBFUN xmlNodePtr +XMLPUBFUN xmlNode * xmlDocGetRootElement (const xmlDoc *doc); -XMLPUBFUN xmlNodePtr +XMLPUBFUN xmlNode * xmlGetLastChild (const xmlNode *parent); XMLPUBFUN int xmlNodeIsText (const xmlNode *node); @@ -949,86 +949,86 @@ XMLPUBFUN int /* * Changing the structure. */ -XMLPUBFUN xmlNodePtr - xmlDocSetRootElement (xmlDocPtr doc, - xmlNodePtr root); +XMLPUBFUN xmlNode * + xmlDocSetRootElement (xmlDoc *doc, + xmlNode *root); XMLPUBFUN void - xmlNodeSetName (xmlNodePtr cur, + xmlNodeSetName (xmlNode *cur, const xmlChar *name); -XMLPUBFUN xmlNodePtr - xmlAddChild (xmlNodePtr parent, - xmlNodePtr cur); -XMLPUBFUN xmlNodePtr - xmlAddChildList (xmlNodePtr parent, - xmlNodePtr cur); -XMLPUBFUN xmlNodePtr - xmlReplaceNode (xmlNodePtr old, - xmlNodePtr cur); -XMLPUBFUN xmlNodePtr - xmlAddPrevSibling (xmlNodePtr cur, - xmlNodePtr elem); -XMLPUBFUN xmlNodePtr - xmlAddSibling (xmlNodePtr cur, - xmlNodePtr elem); -XMLPUBFUN xmlNodePtr - xmlAddNextSibling (xmlNodePtr cur, - xmlNodePtr elem); +XMLPUBFUN xmlNode * + xmlAddChild (xmlNode *parent, + xmlNode *cur); +XMLPUBFUN xmlNode * + xmlAddChildList (xmlNode *parent, + xmlNode *cur); +XMLPUBFUN xmlNode * + xmlReplaceNode (xmlNode *old, + xmlNode *cur); +XMLPUBFUN xmlNode * + xmlAddPrevSibling (xmlNode *cur, + xmlNode *elem); +XMLPUBFUN xmlNode * + xmlAddSibling (xmlNode *cur, + xmlNode *elem); +XMLPUBFUN xmlNode * + xmlAddNextSibling (xmlNode *cur, + xmlNode *elem); XMLPUBFUN void - xmlUnlinkNode (xmlNodePtr cur); -XMLPUBFUN xmlNodePtr - xmlTextMerge (xmlNodePtr first, - xmlNodePtr second); + xmlUnlinkNode (xmlNode *cur); +XMLPUBFUN xmlNode * + xmlTextMerge (xmlNode *first, + xmlNode *second); XMLPUBFUN int - xmlTextConcat (xmlNodePtr node, + xmlTextConcat (xmlNode *node, const xmlChar *content, int len); XMLPUBFUN void - xmlFreeNodeList (xmlNodePtr cur); + xmlFreeNodeList (xmlNode *cur); XMLPUBFUN void - xmlFreeNode (xmlNodePtr cur); + xmlFreeNode (xmlNode *cur); XMLPUBFUN int - xmlSetTreeDoc (xmlNodePtr tree, - xmlDocPtr doc); + xmlSetTreeDoc (xmlNode *tree, + xmlDoc *doc); XMLPUBFUN int - xmlSetListDoc (xmlNodePtr list, - xmlDocPtr doc); + xmlSetListDoc (xmlNode *list, + xmlDoc *doc); /* * Namespaces. */ -XMLPUBFUN xmlNsPtr - xmlSearchNs (xmlDocPtr doc, - xmlNodePtr node, +XMLPUBFUN xmlNs * + xmlSearchNs (xmlDoc *doc, + xmlNode *node, const xmlChar *nameSpace); -XMLPUBFUN xmlNsPtr - xmlSearchNsByHref (xmlDocPtr doc, - xmlNodePtr node, +XMLPUBFUN xmlNs * + xmlSearchNsByHref (xmlDoc *doc, + xmlNode *node, const xmlChar *href); XMLPUBFUN int xmlGetNsListSafe (const xmlDoc *doc, const xmlNode *node, - xmlNsPtr **out); -XMLPUBFUN xmlNsPtr * + xmlNs ***out); +XMLPUBFUN xmlNs ** xmlGetNsList (const xmlDoc *doc, const xmlNode *node); XMLPUBFUN void - xmlSetNs (xmlNodePtr node, - xmlNsPtr ns); -XMLPUBFUN xmlNsPtr - xmlCopyNamespace (xmlNsPtr cur); -XMLPUBFUN xmlNsPtr - xmlCopyNamespaceList (xmlNsPtr cur); + xmlSetNs (xmlNode *node, + xmlNs *ns); +XMLPUBFUN xmlNs * + xmlCopyNamespace (xmlNs *cur); +XMLPUBFUN xmlNs * + xmlCopyNamespaceList (xmlNs *cur); /* * Changing the content. */ -XMLPUBFUN xmlAttrPtr - xmlSetProp (xmlNodePtr node, +XMLPUBFUN xmlAttr * + xmlSetProp (xmlNode *node, const xmlChar *name, const xmlChar *value); -XMLPUBFUN xmlAttrPtr - xmlSetNsProp (xmlNodePtr node, - xmlNsPtr ns, +XMLPUBFUN xmlAttr * + xmlSetNsProp (xmlNode *node, + xmlNs *ns, const xmlChar *name, const xmlChar *value); XMLPUBFUN int @@ -1042,10 +1042,10 @@ XMLPUBFUN xmlChar * XMLPUBFUN xmlChar * xmlGetProp (const xmlNode *node, const xmlChar *name); -XMLPUBFUN xmlAttrPtr +XMLPUBFUN xmlAttr * xmlHasProp (const xmlNode *node, const xmlChar *name); -XMLPUBFUN xmlAttrPtr +XMLPUBFUN xmlAttr * xmlHasNsProp (const xmlNode *node, const xmlChar *name, const xmlChar *nameSpace); @@ -1053,15 +1053,15 @@ XMLPUBFUN xmlChar * xmlGetNsProp (const xmlNode *node, const xmlChar *name, const xmlChar *nameSpace); -XMLPUBFUN xmlNodePtr +XMLPUBFUN xmlNode * xmlStringGetNodeList (const xmlDoc *doc, const xmlChar *value); -XMLPUBFUN xmlNodePtr +XMLPUBFUN xmlNode * xmlStringLenGetNodeList (const xmlDoc *doc, const xmlChar *value, int len); XMLPUBFUN xmlChar * - xmlNodeListGetString (xmlDocPtr doc, + xmlNodeListGetString (xmlDoc *doc, const xmlNode *list, int inLine); XMLPUBFUN xmlChar * @@ -1069,27 +1069,27 @@ XMLPUBFUN xmlChar * const xmlNode *list, int inLine); XMLPUBFUN int - xmlNodeSetContent (xmlNodePtr cur, + xmlNodeSetContent (xmlNode *cur, const xmlChar *content); XMLPUBFUN int - xmlNodeSetContentLen (xmlNodePtr cur, + xmlNodeSetContentLen (xmlNode *cur, const xmlChar *content, int len); XMLPUBFUN int - xmlNodeAddContent (xmlNodePtr cur, + xmlNodeAddContent (xmlNode *cur, const xmlChar *content); XMLPUBFUN int - xmlNodeAddContentLen (xmlNodePtr cur, + xmlNodeAddContentLen (xmlNode *cur, const xmlChar *content, int len); XMLPUBFUN xmlChar * xmlNodeGetContent (const xmlNode *cur); XMLPUBFUN int - xmlNodeBufGetContent (xmlBufferPtr buffer, + xmlNodeBufGetContent (xmlBuffer *buffer, const xmlNode *cur); XMLPUBFUN int - xmlBufGetNodeContent (xmlBufPtr buf, + xmlBufGetNodeContent (xmlBuf *buf, const xmlNode *cur); XMLPUBFUN xmlChar * @@ -1097,10 +1097,10 @@ XMLPUBFUN xmlChar * XMLPUBFUN int xmlNodeGetSpacePreserve (const xmlNode *cur); XMLPUBFUN int - xmlNodeSetLang (xmlNodePtr cur, + xmlNodeSetLang (xmlNode *cur, const xmlChar *lang); XMLPUBFUN int - xmlNodeSetSpacePreserve (xmlNodePtr cur, + xmlNodeSetSpacePreserve (xmlNode *cur, int val); XMLPUBFUN int xmlNodeGetBaseSafe (const xmlDoc *doc, @@ -1110,26 +1110,26 @@ XMLPUBFUN xmlChar * xmlNodeGetBase (const xmlDoc *doc, const xmlNode *cur); XMLPUBFUN int - xmlNodeSetBase (xmlNodePtr cur, + xmlNodeSetBase (xmlNode *cur, const xmlChar *uri); /* * Removing content. */ XMLPUBFUN int - xmlRemoveProp (xmlAttrPtr cur); + xmlRemoveProp (xmlAttr *cur); XMLPUBFUN int - xmlUnsetNsProp (xmlNodePtr node, - xmlNsPtr ns, + xmlUnsetNsProp (xmlNode *node, + xmlNs *ns, const xmlChar *name); XMLPUBFUN int - xmlUnsetProp (xmlNodePtr node, + xmlUnsetProp (xmlNode *node, const xmlChar *name); #ifdef LIBXML_OUTPUT_ENABLED -XMLPUBFUN void xmlAttrSerializeTxtContent(xmlBufferPtr buf, - xmlDocPtr doc, - xmlAttrPtr attr, +XMLPUBFUN void xmlAttrSerializeTxtContent(xmlBuffer *buf, + xmlDoc *doc, + xmlAttr *attr, const xmlChar *string); #endif /* LIBXML_OUTPUT_ENABLED */ @@ -1137,90 +1137,90 @@ XMLPUBFUN void xmlAttrSerializeTxtContent(xmlBufferPtr buf, * Namespace handling. */ XMLPUBFUN int - xmlReconciliateNs (xmlDocPtr doc, - xmlNodePtr tree); + xmlReconciliateNs (xmlDoc *doc, + xmlNode *tree); #ifdef LIBXML_OUTPUT_ENABLED /* * Saving. */ XMLPUBFUN void - xmlDocDumpFormatMemory (xmlDocPtr cur, + xmlDocDumpFormatMemory (xmlDoc *cur, xmlChar **mem, int *size, int format); XMLPUBFUN void - xmlDocDumpMemory (xmlDocPtr cur, + xmlDocDumpMemory (xmlDoc *cur, xmlChar **mem, int *size); XMLPUBFUN void - xmlDocDumpMemoryEnc (xmlDocPtr out_doc, + xmlDocDumpMemoryEnc (xmlDoc *out_doc, xmlChar **doc_txt_ptr, int * doc_txt_len, const char *txt_encoding); XMLPUBFUN void - xmlDocDumpFormatMemoryEnc(xmlDocPtr out_doc, + xmlDocDumpFormatMemoryEnc(xmlDoc *out_doc, xmlChar **doc_txt_ptr, int * doc_txt_len, const char *txt_encoding, int format); XMLPUBFUN int xmlDocFormatDump (FILE *f, - xmlDocPtr cur, + xmlDoc *cur, int format); XMLPUBFUN int xmlDocDump (FILE *f, - xmlDocPtr cur); + xmlDoc *cur); XMLPUBFUN void xmlElemDump (FILE *f, - xmlDocPtr doc, - xmlNodePtr cur); + xmlDoc *doc, + xmlNode *cur); XMLPUBFUN int xmlSaveFile (const char *filename, - xmlDocPtr cur); + xmlDoc *cur); XMLPUBFUN int xmlSaveFormatFile (const char *filename, - xmlDocPtr cur, + xmlDoc *cur, int format); XMLPUBFUN size_t - xmlBufNodeDump (xmlBufPtr buf, - xmlDocPtr doc, - xmlNodePtr cur, + xmlBufNodeDump (xmlBuf *buf, + xmlDoc *doc, + xmlNode *cur, int level, int format); XMLPUBFUN int - xmlNodeDump (xmlBufferPtr buf, - xmlDocPtr doc, - xmlNodePtr cur, + xmlNodeDump (xmlBuffer *buf, + xmlDoc *doc, + xmlNode *cur, int level, int format); XMLPUBFUN int - xmlSaveFileTo (xmlOutputBufferPtr buf, - xmlDocPtr cur, + xmlSaveFileTo (xmlOutputBuffer *buf, + xmlDoc *cur, const char *encoding); XMLPUBFUN int - xmlSaveFormatFileTo (xmlOutputBufferPtr buf, - xmlDocPtr cur, + xmlSaveFormatFileTo (xmlOutputBuffer *buf, + xmlDoc *cur, const char *encoding, int format); XMLPUBFUN void - xmlNodeDumpOutput (xmlOutputBufferPtr buf, - xmlDocPtr doc, - xmlNodePtr cur, + xmlNodeDumpOutput (xmlOutputBuffer *buf, + xmlDoc *doc, + xmlNode *cur, int level, int format, const char *encoding); XMLPUBFUN int xmlSaveFormatFileEnc (const char *filename, - xmlDocPtr cur, + xmlDoc *cur, const char *encoding, int format); XMLPUBFUN int xmlSaveFileEnc (const char *filename, - xmlDocPtr cur, + xmlDoc *cur, const char *encoding); #endif /* LIBXML_OUTPUT_ENABLED */ @@ -1237,7 +1237,7 @@ XMLPUBFUN int XMLPUBFUN int xmlGetDocCompressMode (const xmlDoc *doc); XMLPUBFUN void - xmlSetDocCompressMode (xmlDocPtr doc, + xmlSetDocCompressMode (xmlDoc *doc, int mode); XML_DEPRECATED XMLPUBFUN int @@ -1249,33 +1249,33 @@ XMLPUBFUN void /* * DOM-wrapper helper functions. */ -XMLPUBFUN xmlDOMWrapCtxtPtr +XMLPUBFUN xmlDOMWrapCtxt * xmlDOMWrapNewCtxt (void); XMLPUBFUN void - xmlDOMWrapFreeCtxt (xmlDOMWrapCtxtPtr ctxt); + xmlDOMWrapFreeCtxt (xmlDOMWrapCtxt *ctxt); XMLPUBFUN int - xmlDOMWrapReconcileNamespaces(xmlDOMWrapCtxtPtr ctxt, - xmlNodePtr elem, + xmlDOMWrapReconcileNamespaces(xmlDOMWrapCtxt *ctxt, + xmlNode *elem, int options); XMLPUBFUN int - xmlDOMWrapAdoptNode (xmlDOMWrapCtxtPtr ctxt, - xmlDocPtr sourceDoc, - xmlNodePtr node, - xmlDocPtr destDoc, - xmlNodePtr destParent, + xmlDOMWrapAdoptNode (xmlDOMWrapCtxt *ctxt, + xmlDoc *sourceDoc, + xmlNode *node, + xmlDoc *destDoc, + xmlNode *destParent, int options); XMLPUBFUN int - xmlDOMWrapRemoveNode (xmlDOMWrapCtxtPtr ctxt, - xmlDocPtr doc, - xmlNodePtr node, + xmlDOMWrapRemoveNode (xmlDOMWrapCtxt *ctxt, + xmlDoc *doc, + xmlNode *node, int options); XMLPUBFUN int - xmlDOMWrapCloneNode (xmlDOMWrapCtxtPtr ctxt, - xmlDocPtr sourceDoc, - xmlNodePtr node, - xmlNodePtr *clonedNode, - xmlDocPtr destDoc, - xmlNodePtr destParent, + xmlDOMWrapCloneNode (xmlDOMWrapCtxt *ctxt, + xmlDoc *sourceDoc, + xmlNode *node, + xmlNode **clonedNode, + xmlDoc *destDoc, + xmlNode *destParent, int deep, int options); @@ -1284,15 +1284,15 @@ XMLPUBFUN int * traversal. */ XMLPUBFUN unsigned long - xmlChildElementCount (xmlNodePtr parent); -XMLPUBFUN xmlNodePtr - xmlNextElementSibling (xmlNodePtr node); -XMLPUBFUN xmlNodePtr - xmlFirstElementChild (xmlNodePtr parent); -XMLPUBFUN xmlNodePtr - xmlLastElementChild (xmlNodePtr parent); -XMLPUBFUN xmlNodePtr - xmlPreviousElementSibling (xmlNodePtr node); + xmlChildElementCount (xmlNode *parent); +XMLPUBFUN xmlNode * + xmlNextElementSibling (xmlNode *node); +XMLPUBFUN xmlNode * + xmlFirstElementChild (xmlNode *parent); +XMLPUBFUN xmlNode * + xmlLastElementChild (xmlNode *parent); +XMLPUBFUN xmlNode * + xmlPreviousElementSibling (xmlNode *node); XML_DEPRECATED XMLPUBFUN xmlRegisterNodeFunc @@ -1318,63 +1318,63 @@ XML_DEPRECATED XMLPUBFUN xmlBufferAllocationScheme xmlGetBufferAllocationScheme(void); -XMLPUBFUN xmlBufferPtr +XMLPUBFUN xmlBuffer * xmlBufferCreate (void); -XMLPUBFUN xmlBufferPtr +XMLPUBFUN xmlBuffer * xmlBufferCreateSize (size_t size); -XMLPUBFUN xmlBufferPtr +XMLPUBFUN xmlBuffer * xmlBufferCreateStatic (void *mem, size_t size); XML_DEPRECATED XMLPUBFUN int - xmlBufferResize (xmlBufferPtr buf, + xmlBufferResize (xmlBuffer *buf, unsigned int size); XMLPUBFUN void - xmlBufferFree (xmlBufferPtr buf); + xmlBufferFree (xmlBuffer *buf); XMLPUBFUN int xmlBufferDump (FILE *file, - xmlBufferPtr buf); + xmlBuffer *buf); XMLPUBFUN int - xmlBufferAdd (xmlBufferPtr buf, + xmlBufferAdd (xmlBuffer *buf, const xmlChar *str, int len); XMLPUBFUN int - xmlBufferAddHead (xmlBufferPtr buf, + xmlBufferAddHead (xmlBuffer *buf, const xmlChar *str, int len); XMLPUBFUN int - xmlBufferCat (xmlBufferPtr buf, + xmlBufferCat (xmlBuffer *buf, const xmlChar *str); XMLPUBFUN int - xmlBufferCCat (xmlBufferPtr buf, + xmlBufferCCat (xmlBuffer *buf, const char *str); XML_DEPRECATED XMLPUBFUN int - xmlBufferShrink (xmlBufferPtr buf, + xmlBufferShrink (xmlBuffer *buf, unsigned int len); XML_DEPRECATED XMLPUBFUN int - xmlBufferGrow (xmlBufferPtr buf, + xmlBufferGrow (xmlBuffer *buf, unsigned int len); XMLPUBFUN void - xmlBufferEmpty (xmlBufferPtr buf); + xmlBufferEmpty (xmlBuffer *buf); XMLPUBFUN const xmlChar* xmlBufferContent (const xmlBuffer *buf); XMLPUBFUN xmlChar* - xmlBufferDetach (xmlBufferPtr buf); + xmlBufferDetach (xmlBuffer *buf); XMLPUBFUN void - xmlBufferSetAllocationScheme(xmlBufferPtr buf, + xmlBufferSetAllocationScheme(xmlBuffer *buf, xmlBufferAllocationScheme scheme); XMLPUBFUN int xmlBufferLength (const xmlBuffer *buf); XMLPUBFUN void - xmlBufferWriteCHAR (xmlBufferPtr buf, + xmlBufferWriteCHAR (xmlBuffer *buf, const xmlChar *string); XMLPUBFUN void - xmlBufferWriteChar (xmlBufferPtr buf, + xmlBufferWriteChar (xmlBuffer *buf, const char *string); XMLPUBFUN void - xmlBufferWriteQuotedString(xmlBufferPtr buf, + xmlBufferWriteQuotedString(xmlBuffer *buf, const xmlChar *string); /* @@ -1382,9 +1382,9 @@ XMLPUBFUN void * mostly internally the bulk of the routines are internal in buf.h */ XMLPUBFUN xmlChar* xmlBufContent (const xmlBuf* buf); -XMLPUBFUN xmlChar* xmlBufEnd (xmlBufPtr buf); -XMLPUBFUN size_t xmlBufUse (const xmlBufPtr buf); -XMLPUBFUN size_t xmlBufShrink (xmlBufPtr buf, size_t len); +XMLPUBFUN xmlChar* xmlBufEnd (xmlBuf *buf); +XMLPUBFUN size_t xmlBufUse (xmlBuf *buf); +XMLPUBFUN size_t xmlBufShrink (xmlBuf *buf, size_t len); #ifdef __cplusplus } diff --git a/include/libxml/uri.h b/include/libxml/uri.h index 808958c6..d13b048b 100644 --- a/include/libxml/uri.h +++ b/include/libxml/uri.h @@ -48,12 +48,7 @@ struct _xmlURI { char *query_raw; /* the query string (as it appears in the URI) */ }; -/* - * This function is in tree.h: - * xmlChar * xmlNodeGetBase (xmlDocPtr doc, - * xmlNodePtr cur); - */ -XMLPUBFUN xmlURIPtr +XMLPUBFUN xmlURI * xmlCreateURI (void); XMLPUBFUN int xmlBuildURISafe (const xmlChar *URI, @@ -69,22 +64,22 @@ XMLPUBFUN int XMLPUBFUN xmlChar * xmlBuildRelativeURI (const xmlChar *URI, const xmlChar *base); -XMLPUBFUN xmlURIPtr +XMLPUBFUN xmlURI * xmlParseURI (const char *str); XMLPUBFUN int xmlParseURISafe (const char *str, - xmlURIPtr *uri); -XMLPUBFUN xmlURIPtr + xmlURI **uri); +XMLPUBFUN xmlURI * xmlParseURIRaw (const char *str, int raw); XMLPUBFUN int - xmlParseURIReference (xmlURIPtr uri, + xmlParseURIReference (xmlURI *uri, const char *str); XMLPUBFUN xmlChar * - xmlSaveUri (xmlURIPtr uri); + xmlSaveUri (xmlURI *uri); XMLPUBFUN void xmlPrintURI (FILE *stream, - xmlURIPtr uri); + xmlURI *uri); XMLPUBFUN xmlChar * xmlURIEscapeStr (const xmlChar *str, const xmlChar *list); @@ -97,7 +92,7 @@ XMLPUBFUN int XMLPUBFUN xmlChar * xmlURIEscape (const xmlChar *str); XMLPUBFUN void - xmlFreeURI (xmlURIPtr uri); + xmlFreeURI (xmlURI *uri); XMLPUBFUN xmlChar* xmlCanonicPath (const xmlChar *path); XMLPUBFUN xmlChar* diff --git a/include/libxml/valid.h b/include/libxml/valid.h index 9fbda48e..6b2c2d0f 100644 --- a/include/libxml/valid.h +++ b/include/libxml/valid.h @@ -37,7 +37,7 @@ typedef xmlValidState *xmlValidStatePtr; /** * Report a validity error. * - * @param ctx user data (usually an xmlValidCtxtPtr) + * @param ctx user data (usually an xmlValidCtxt) * @param msg printf-like format string * @param ... arguments to format */ @@ -48,7 +48,7 @@ typedef void (*xmlValidityErrorFunc) (void *ctx, /** * Report a validity warning. * - * @param ctx user data (usually an xmlValidCtxtPtr) + * @param ctx user data (usually an xmlValidCtxt) * @param msg printf-like format string * @param ... arguments to format */ @@ -67,13 +67,13 @@ struct _xmlValidCtxt { 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 */ @@ -83,8 +83,8 @@ 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; @@ -108,176 +108,176 @@ typedef xmlRefTable *xmlRefTablePtr; /* Notation */ XML_DEPRECATED -XMLPUBFUN xmlNotationPtr - xmlAddNotationDecl (xmlValidCtxtPtr ctxt, - xmlDtdPtr dtd, +XMLPUBFUN xmlNotation * + xmlAddNotationDecl (xmlValidCtxt *ctxt, + xmlDtd *dtd, const xmlChar *name, 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 */ 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); + 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 */ XML_DEPRECATED -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 */ XML_DEPRECATED -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); /** @@ -285,114 +285,114 @@ 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 */ 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 @@ -423,25 +423,25 @@ 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 */ diff --git a/include/libxml/xinclude.h b/include/libxml/xinclude.h index 1a5a90b9..30be96e4 100644 --- a/include/libxml/xinclude.h +++ b/include/libxml/xinclude.h @@ -75,46 +75,46 @@ typedef xmlXIncludeCtxt *xmlXIncludeCtxtPtr; * standalone processing */ XMLPUBFUN int - xmlXIncludeProcess (xmlDocPtr doc); + xmlXIncludeProcess (xmlDoc *doc); XMLPUBFUN int - xmlXIncludeProcessFlags (xmlDocPtr doc, + xmlXIncludeProcessFlags (xmlDoc *doc, int flags); XMLPUBFUN int - xmlXIncludeProcessFlagsData(xmlDocPtr doc, + xmlXIncludeProcessFlagsData(xmlDoc *doc, int flags, void *data); XMLPUBFUN int - xmlXIncludeProcessTreeFlagsData(xmlNodePtr tree, + xmlXIncludeProcessTreeFlagsData(xmlNode *tree, int flags, void *data); XMLPUBFUN int - xmlXIncludeProcessTree (xmlNodePtr tree); + xmlXIncludeProcessTree (xmlNode *tree); XMLPUBFUN int - xmlXIncludeProcessTreeFlags(xmlNodePtr tree, + xmlXIncludeProcessTreeFlags(xmlNode *tree, int flags); /* * contextual processing */ -XMLPUBFUN xmlXIncludeCtxtPtr - xmlXIncludeNewContext (xmlDocPtr doc); +XMLPUBFUN xmlXIncludeCtxt * + xmlXIncludeNewContext (xmlDoc *doc); XMLPUBFUN int - xmlXIncludeSetFlags (xmlXIncludeCtxtPtr ctxt, + xmlXIncludeSetFlags (xmlXIncludeCtxt *ctxt, int flags); XMLPUBFUN void - xmlXIncludeSetErrorHandler(xmlXIncludeCtxtPtr ctxt, + xmlXIncludeSetErrorHandler(xmlXIncludeCtxt *ctxt, xmlStructuredErrorFunc handler, void *data); XMLPUBFUN void - xmlXIncludeSetResourceLoader(xmlXIncludeCtxtPtr ctxt, + xmlXIncludeSetResourceLoader(xmlXIncludeCtxt *ctxt, xmlResourceLoader loader, void *data); XMLPUBFUN int - xmlXIncludeGetLastError (xmlXIncludeCtxtPtr ctxt); + xmlXIncludeGetLastError (xmlXIncludeCtxt *ctxt); XMLPUBFUN void - xmlXIncludeFreeContext (xmlXIncludeCtxtPtr ctxt); + xmlXIncludeFreeContext (xmlXIncludeCtxt *ctxt); XMLPUBFUN int - xmlXIncludeProcessNode (xmlXIncludeCtxtPtr ctxt, - xmlNodePtr tree); + xmlXIncludeProcessNode (xmlXIncludeCtxt *ctxt, + xmlNode *tree); #ifdef __cplusplus } #endif diff --git a/include/libxml/xlink.h b/include/libxml/xlink.h index edbc932d..35978d16 100644 --- a/include/libxml/xlink.h +++ b/include/libxml/xlink.h @@ -67,7 +67,7 @@ typedef enum { * @param ctx user data pointer * @param node the node to check */ -typedef void (*xlinkNodeDetectFunc) (void *ctx, xmlNodePtr node); +typedef void (*xlinkNodeDetectFunc) (void *ctx, xmlNode *node); /* * The link detection module interact with the upper layers using @@ -85,7 +85,7 @@ typedef void (*xlinkNodeDetectFunc) (void *ctx, xmlNodePtr node); */ typedef void (*xlinkSimpleLinkFunk) (void *ctx, - xmlNodePtr node, + xmlNode *node, const xlinkHRef href, const xlinkRole role, const xlinkTitle title); @@ -109,7 +109,7 @@ typedef void */ typedef void (*xlinkExtendedLinkFunk)(void *ctx, - xmlNodePtr node, + xmlNode *node, int nbLocators, const xlinkHRef *hrefs, const xlinkRole *roles, @@ -136,7 +136,7 @@ typedef void */ typedef void (*xlinkExtendedLinkSetFunk) (void *ctx, - xmlNodePtr node, + xmlNode *node, int nbLocators, const xlinkHRef *hrefs, const xlinkRole *roles, @@ -174,19 +174,19 @@ XMLPUBFUN void * Routines to set/get the default handlers. */ XML_DEPRECATED -XMLPUBFUN xlinkHandlerPtr +XMLPUBFUN xlinkHandler * xlinkGetDefaultHandler (void); XML_DEPRECATED XMLPUBFUN void - xlinkSetDefaultHandler (xlinkHandlerPtr handler); + xlinkSetDefaultHandler (xlinkHandler *handler); /* * Link detection module itself. */ XML_DEPRECATED XMLPUBFUN xlinkType - xlinkIsLink (xmlDocPtr doc, - xmlNodePtr node); + xlinkIsLink (xmlDoc *doc, + xmlNode *node); #ifdef __cplusplus } diff --git a/include/libxml/xmlIO.h b/include/libxml/xmlIO.h index cea5108f..8dc08ba4 100644 --- a/include/libxml/xmlIO.h +++ b/include/libxml/xmlIO.h @@ -97,10 +97,10 @@ typedef int (*xmlOutputCloseCallback) (void * context); * * @param URI the URI to read from * @param enc the requested source encoding - * @returns the new xmlParserInputBufferPtr in case of success or NULL if no + * @returns the new xmlParserInputBuffer in case of success or NULL if no * method was found. */ -typedef xmlParserInputBufferPtr +typedef xmlParserInputBuffer * (*xmlParserInputBufferCreateFilenameFunc)(const char *URI, xmlCharEncoding enc); /** @@ -110,12 +110,12 @@ typedef xmlParserInputBufferPtr * @param URI the URI to write to * @param encoder the requested target encoding * @param compression compression level - * @returns the new xmlOutputBufferPtr in case of success or NULL if no + * @returns the new xmlOutputBuffer in case of success or NULL if no * method was found. */ -typedef xmlOutputBufferPtr +typedef xmlOutputBuffer * (*xmlOutputBufferCreateFilenameFunc)(const char *URI, - xmlCharEncodingHandlerPtr encoder, int compression); + xmlCharEncodingHandler *encoder, int compression); /** * Parser input buffer @@ -128,10 +128,10 @@ struct _xmlParserInputBuffer { xmlInputReadCallback readcallback; xmlInputCloseCallback closecallback; - xmlCharEncodingHandlerPtr encoder; /* I18N conversions to UTF-8 */ + xmlCharEncodingHandler *encoder; /* I18N conversions to UTF-8 */ - xmlBufPtr buffer; /* Local buffer encoded in UTF-8 */ - xmlBufPtr raw; /* if encoder != NULL buffer for raw input */ + xmlBuf *buffer; /* Local buffer encoded in UTF-8 */ + xmlBuf *raw; /* if encoder != NULL buffer for raw input */ int compressed; /* -1=unknown, 0=not compressed, 1=compressed */ int error; unsigned long rawconsumed;/* amount consumed from raw */ @@ -147,10 +147,10 @@ struct _xmlOutputBuffer { xmlOutputWriteCallback writecallback; xmlOutputCloseCallback closecallback; - xmlCharEncodingHandlerPtr encoder; /* I18N conversions to UTF-8 */ + xmlCharEncodingHandler *encoder; /* I18N conversions to UTF-8 */ - xmlBufPtr buffer; /* Local buffer encoded in UTF-8 or ISOLatin */ - xmlBufPtr conv; /* if encoder != NULL buffer for output */ + xmlBuf *buffer; /* Local buffer encoded in UTF-8 or ISOLatin */ + xmlBuf *conv; /* if encoder != NULL buffer for output */ int written; /* total number of byte written */ int error; }; @@ -185,45 +185,45 @@ XMLPUBFUN int XMLPUBFUN void xmlRegisterDefaultInputCallbacks (void); -XMLPUBFUN xmlParserInputBufferPtr +XMLPUBFUN xmlParserInputBuffer * xmlAllocParserInputBuffer (xmlCharEncoding enc); -XMLPUBFUN xmlParserInputBufferPtr +XMLPUBFUN xmlParserInputBuffer * xmlParserInputBufferCreateFilename (const char *URI, xmlCharEncoding enc); XML_DEPRECATED -XMLPUBFUN xmlParserInputBufferPtr +XMLPUBFUN xmlParserInputBuffer * xmlParserInputBufferCreateFile (FILE *file, xmlCharEncoding enc); -XMLPUBFUN xmlParserInputBufferPtr +XMLPUBFUN xmlParserInputBuffer * xmlParserInputBufferCreateFd (int fd, xmlCharEncoding enc); -XMLPUBFUN xmlParserInputBufferPtr +XMLPUBFUN xmlParserInputBuffer * xmlParserInputBufferCreateMem (const char *mem, int size, xmlCharEncoding enc); -XMLPUBFUN xmlParserInputBufferPtr +XMLPUBFUN xmlParserInputBuffer * xmlParserInputBufferCreateStatic (const char *mem, int size, xmlCharEncoding enc); -XMLPUBFUN xmlParserInputBufferPtr +XMLPUBFUN xmlParserInputBuffer * xmlParserInputBufferCreateIO (xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void *ioctx, xmlCharEncoding enc); XML_DEPRECATED XMLPUBFUN int - xmlParserInputBufferRead (xmlParserInputBufferPtr in, + xmlParserInputBufferRead (xmlParserInputBuffer *in, int len); XML_DEPRECATED XMLPUBFUN int - xmlParserInputBufferGrow (xmlParserInputBufferPtr in, + xmlParserInputBufferGrow (xmlParserInputBuffer *in, int len); XML_DEPRECATED XMLPUBFUN int - xmlParserInputBufferPush (xmlParserInputBufferPtr in, + xmlParserInputBufferPush (xmlParserInputBuffer *in, int len, const char *buf); XMLPUBFUN void - xmlFreeParserInputBuffer (xmlParserInputBufferPtr in); + xmlFreeParserInputBuffer (xmlParserInputBuffer *in); XMLPUBFUN char * xmlParserGetDirectory (const char *filename); @@ -233,7 +233,7 @@ XMLPUBFUN int xmlInputReadCallback readFunc, xmlInputCloseCallback closeFunc); -XMLPUBFUN xmlParserInputBufferPtr +XMLPUBFUN xmlParserInputBuffer * __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc); @@ -247,54 +247,54 @@ XMLPUBFUN int xmlPopOutputCallbacks (void); XMLPUBFUN void xmlRegisterDefaultOutputCallbacks(void); -XMLPUBFUN xmlOutputBufferPtr - xmlAllocOutputBuffer (xmlCharEncodingHandlerPtr encoder); +XMLPUBFUN xmlOutputBuffer * + xmlAllocOutputBuffer (xmlCharEncodingHandler *encoder); -XMLPUBFUN xmlOutputBufferPtr +XMLPUBFUN xmlOutputBuffer * xmlOutputBufferCreateFilename (const char *URI, - xmlCharEncodingHandlerPtr encoder, + xmlCharEncodingHandler *encoder, int compression); -XMLPUBFUN xmlOutputBufferPtr +XMLPUBFUN xmlOutputBuffer * xmlOutputBufferCreateFile (FILE *file, - xmlCharEncodingHandlerPtr encoder); + xmlCharEncodingHandler *encoder); -XMLPUBFUN xmlOutputBufferPtr - xmlOutputBufferCreateBuffer (xmlBufferPtr buffer, - xmlCharEncodingHandlerPtr encoder); +XMLPUBFUN xmlOutputBuffer * + xmlOutputBufferCreateBuffer (xmlBuffer *buffer, + xmlCharEncodingHandler *encoder); -XMLPUBFUN xmlOutputBufferPtr +XMLPUBFUN xmlOutputBuffer * xmlOutputBufferCreateFd (int fd, - xmlCharEncodingHandlerPtr encoder); + xmlCharEncodingHandler *encoder); -XMLPUBFUN xmlOutputBufferPtr +XMLPUBFUN xmlOutputBuffer * xmlOutputBufferCreateIO (xmlOutputWriteCallback iowrite, xmlOutputCloseCallback ioclose, void *ioctx, - xmlCharEncodingHandlerPtr encoder); + xmlCharEncodingHandler *encoder); /* Couple of APIs to get the output without digging into the buffers */ XMLPUBFUN const xmlChar * - xmlOutputBufferGetContent (xmlOutputBufferPtr out); + xmlOutputBufferGetContent (xmlOutputBuffer *out); XMLPUBFUN size_t - xmlOutputBufferGetSize (xmlOutputBufferPtr out); + xmlOutputBufferGetSize (xmlOutputBuffer *out); XMLPUBFUN int - xmlOutputBufferWrite (xmlOutputBufferPtr out, + xmlOutputBufferWrite (xmlOutputBuffer *out, int len, const char *buf); XMLPUBFUN int - xmlOutputBufferWriteString (xmlOutputBufferPtr out, + xmlOutputBufferWriteString (xmlOutputBuffer *out, const char *str); XMLPUBFUN int - xmlOutputBufferWriteEscape (xmlOutputBufferPtr out, + xmlOutputBufferWriteEscape (xmlOutputBuffer *out, const xmlChar *str, xmlCharEncodingOutputFunc escaping); XMLPUBFUN int - xmlOutputBufferFlush (xmlOutputBufferPtr out); + xmlOutputBufferFlush (xmlOutputBuffer *out); XMLPUBFUN int - xmlOutputBufferClose (xmlOutputBufferPtr out); + xmlOutputBufferClose (xmlOutputBuffer *out); XMLPUBFUN int xmlRegisterOutputCallbacks (xmlOutputMatchCallback matchFunc, @@ -302,22 +302,22 @@ XMLPUBFUN int xmlOutputWriteCallback writeFunc, xmlOutputCloseCallback closeFunc); -XMLPUBFUN xmlOutputBufferPtr +XMLPUBFUN xmlOutputBuffer * __xmlOutputBufferCreateFilename(const char *URI, - xmlCharEncodingHandlerPtr encoder, + xmlCharEncodingHandler *encoder, int compression); #endif /* LIBXML_OUTPUT_ENABLED */ XML_DEPRECATED -XMLPUBFUN xmlParserInputPtr - xmlCheckHTTPInput (xmlParserCtxtPtr ctxt, - xmlParserInputPtr ret); +XMLPUBFUN xmlParserInput * + xmlCheckHTTPInput (xmlParserCtxt *ctxt, + xmlParserInput *ret); XML_DEPRECATED -XMLPUBFUN xmlParserInputPtr +XMLPUBFUN xmlParserInput * xmlNoNetExternalEntityLoader (const char *URL, const char *ID, - xmlParserCtxtPtr ctxt); + xmlParserCtxt *ctxt); XML_DEPRECATED XMLPUBFUN xmlChar * diff --git a/include/libxml/xmlautomata.h b/include/libxml/xmlautomata.h index 68bfc3fd..3ee6d2b1 100644 --- a/include/libxml/xmlautomata.h +++ b/include/libxml/xmlautomata.h @@ -39,119 +39,119 @@ typedef xmlAutomataState *xmlAutomataStatePtr; * Building API */ XML_DEPRECATED -XMLPUBFUN xmlAutomataPtr +XMLPUBFUN xmlAutomata * xmlNewAutomata (void); XML_DEPRECATED XMLPUBFUN void - xmlFreeAutomata (xmlAutomataPtr am); + xmlFreeAutomata (xmlAutomata *am); XML_DEPRECATED -XMLPUBFUN xmlAutomataStatePtr - xmlAutomataGetInitState (xmlAutomataPtr am); +XMLPUBFUN xmlAutomataState * + xmlAutomataGetInitState (xmlAutomata *am); XML_DEPRECATED XMLPUBFUN int - xmlAutomataSetFinalState (xmlAutomataPtr am, - xmlAutomataStatePtr state); + xmlAutomataSetFinalState (xmlAutomata *am, + xmlAutomataState *state); XML_DEPRECATED -XMLPUBFUN xmlAutomataStatePtr - xmlAutomataNewState (xmlAutomataPtr am); +XMLPUBFUN xmlAutomataState * + xmlAutomataNewState (xmlAutomata *am); XML_DEPRECATED -XMLPUBFUN xmlAutomataStatePtr - xmlAutomataNewTransition (xmlAutomataPtr am, - xmlAutomataStatePtr from, - xmlAutomataStatePtr to, +XMLPUBFUN xmlAutomataState * + xmlAutomataNewTransition (xmlAutomata *am, + xmlAutomataState *from, + xmlAutomataState *to, const xmlChar *token, void *data); XML_DEPRECATED -XMLPUBFUN xmlAutomataStatePtr - xmlAutomataNewTransition2 (xmlAutomataPtr am, - xmlAutomataStatePtr from, - xmlAutomataStatePtr to, +XMLPUBFUN xmlAutomataState * + xmlAutomataNewTransition2 (xmlAutomata *am, + xmlAutomataState *from, + xmlAutomataState *to, const xmlChar *token, const xmlChar *token2, void *data); XML_DEPRECATED -XMLPUBFUN xmlAutomataStatePtr - xmlAutomataNewNegTrans (xmlAutomataPtr am, - xmlAutomataStatePtr from, - xmlAutomataStatePtr to, +XMLPUBFUN xmlAutomataState * + xmlAutomataNewNegTrans (xmlAutomata *am, + xmlAutomataState *from, + xmlAutomataState *to, const xmlChar *token, const xmlChar *token2, void *data); XML_DEPRECATED -XMLPUBFUN xmlAutomataStatePtr - xmlAutomataNewCountTrans (xmlAutomataPtr am, - xmlAutomataStatePtr from, - xmlAutomataStatePtr to, +XMLPUBFUN xmlAutomataState * + xmlAutomataNewCountTrans (xmlAutomata *am, + xmlAutomataState *from, + xmlAutomataState *to, const xmlChar *token, int min, int max, void *data); XML_DEPRECATED -XMLPUBFUN xmlAutomataStatePtr - xmlAutomataNewCountTrans2 (xmlAutomataPtr am, - xmlAutomataStatePtr from, - xmlAutomataStatePtr to, +XMLPUBFUN xmlAutomataState * + xmlAutomataNewCountTrans2 (xmlAutomata *am, + xmlAutomataState *from, + xmlAutomataState *to, const xmlChar *token, const xmlChar *token2, int min, int max, void *data); XML_DEPRECATED -XMLPUBFUN xmlAutomataStatePtr - xmlAutomataNewOnceTrans (xmlAutomataPtr am, - xmlAutomataStatePtr from, - xmlAutomataStatePtr to, +XMLPUBFUN xmlAutomataState * + xmlAutomataNewOnceTrans (xmlAutomata *am, + xmlAutomataState *from, + xmlAutomataState *to, const xmlChar *token, int min, int max, void *data); XML_DEPRECATED -XMLPUBFUN xmlAutomataStatePtr - xmlAutomataNewOnceTrans2 (xmlAutomataPtr am, - xmlAutomataStatePtr from, - xmlAutomataStatePtr to, +XMLPUBFUN xmlAutomataState * + xmlAutomataNewOnceTrans2 (xmlAutomata *am, + xmlAutomataState *from, + xmlAutomataState *to, const xmlChar *token, const xmlChar *token2, int min, int max, void *data); XML_DEPRECATED -XMLPUBFUN xmlAutomataStatePtr - xmlAutomataNewAllTrans (xmlAutomataPtr am, - xmlAutomataStatePtr from, - xmlAutomataStatePtr to, +XMLPUBFUN xmlAutomataState * + xmlAutomataNewAllTrans (xmlAutomata *am, + xmlAutomataState *from, + xmlAutomataState *to, int lax); XML_DEPRECATED -XMLPUBFUN xmlAutomataStatePtr - xmlAutomataNewEpsilon (xmlAutomataPtr am, - xmlAutomataStatePtr from, - xmlAutomataStatePtr to); +XMLPUBFUN xmlAutomataState * + xmlAutomataNewEpsilon (xmlAutomata *am, + xmlAutomataState *from, + xmlAutomataState *to); XML_DEPRECATED -XMLPUBFUN xmlAutomataStatePtr - xmlAutomataNewCountedTrans (xmlAutomataPtr am, - xmlAutomataStatePtr from, - xmlAutomataStatePtr to, +XMLPUBFUN xmlAutomataState * + xmlAutomataNewCountedTrans (xmlAutomata *am, + xmlAutomataState *from, + xmlAutomataState *to, int counter); XML_DEPRECATED -XMLPUBFUN xmlAutomataStatePtr - xmlAutomataNewCounterTrans (xmlAutomataPtr am, - xmlAutomataStatePtr from, - xmlAutomataStatePtr to, +XMLPUBFUN xmlAutomataState * + xmlAutomataNewCounterTrans (xmlAutomata *am, + xmlAutomataState *from, + xmlAutomataState *to, int counter); XML_DEPRECATED XMLPUBFUN int - xmlAutomataNewCounter (xmlAutomataPtr am, + xmlAutomataNewCounter (xmlAutomata *am, int min, int max); XML_DEPRECATED XMLPUBFUN struct _xmlRegexp * - xmlAutomataCompile (xmlAutomataPtr am); + xmlAutomataCompile (xmlAutomata *am); XML_DEPRECATED XMLPUBFUN int - xmlAutomataIsDeterminist (xmlAutomataPtr am); + xmlAutomataIsDeterminist (xmlAutomata *am); #ifdef __cplusplus } diff --git a/include/libxml/xmlerror.h b/include/libxml/xmlerror.h index 18a6a5ea..12502c9b 100644 --- a/include/libxml/xmlerror.h +++ b/include/libxml/xmlerror.h @@ -1024,10 +1024,10 @@ XMLPUBFUN const xmlError * XMLPUBFUN void xmlCtxtResetLastError (void *ctx); XMLPUBFUN void - xmlResetError (xmlErrorPtr err); + xmlResetError (xmlError *err); XMLPUBFUN int xmlCopyError (const xmlError *from, - xmlErrorPtr to); + xmlError *to); #ifdef __cplusplus } diff --git a/include/libxml/xmlmodule.h b/include/libxml/xmlmodule.h index 70e4e3a4..e2bad3cd 100644 --- a/include/libxml/xmlmodule.h +++ b/include/libxml/xmlmodule.h @@ -37,19 +37,19 @@ typedef enum { } xmlModuleOption; XML_DEPRECATED -XMLPUBFUN xmlModulePtr xmlModuleOpen (const char *filename, +XMLPUBFUN xmlModule *xmlModuleOpen (const char *filename, int options); XML_DEPRECATED -XMLPUBFUN int xmlModuleSymbol (xmlModulePtr module, +XMLPUBFUN int xmlModuleSymbol (xmlModule *module, const char* name, void **result); XML_DEPRECATED -XMLPUBFUN int xmlModuleClose (xmlModulePtr module); +XMLPUBFUN int xmlModuleClose (xmlModule *module); XML_DEPRECATED -XMLPUBFUN int xmlModuleFree (xmlModulePtr module); +XMLPUBFUN int xmlModuleFree (xmlModule *module); #ifdef __cplusplus } diff --git a/include/libxml/xmlreader.h b/include/libxml/xmlreader.h index 54e4fd1e..4e8c1421 100644 --- a/include/libxml/xmlreader.h +++ b/include/libxml/xmlreader.h @@ -125,246 +125,246 @@ typedef xmlTextReader *xmlTextReaderPtr; /* * Constructors & Destructor */ -XMLPUBFUN xmlTextReaderPtr - xmlNewTextReader (xmlParserInputBufferPtr input, +XMLPUBFUN xmlTextReader * + xmlNewTextReader (xmlParserInputBuffer *input, const char *URI); -XMLPUBFUN xmlTextReaderPtr +XMLPUBFUN xmlTextReader * xmlNewTextReaderFilename(const char *URI); XMLPUBFUN void - xmlFreeTextReader (xmlTextReaderPtr reader); + xmlFreeTextReader (xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderSetup(xmlTextReaderPtr reader, - xmlParserInputBufferPtr input, const char *URL, + xmlTextReaderSetup(xmlTextReader *reader, + xmlParserInputBuffer *input, const char *URL, const char *encoding, int options); XMLPUBFUN void - xmlTextReaderSetMaxAmplification(xmlTextReaderPtr reader, + xmlTextReaderSetMaxAmplification(xmlTextReader *reader, unsigned maxAmpl); XMLPUBFUN const xmlError * - xmlTextReaderGetLastError(xmlTextReaderPtr reader); + xmlTextReaderGetLastError(xmlTextReader *reader); /* * Iterators */ XMLPUBFUN int - xmlTextReaderRead (xmlTextReaderPtr reader); + xmlTextReaderRead (xmlTextReader *reader); #ifdef LIBXML_WRITER_ENABLED XMLPUBFUN xmlChar * - xmlTextReaderReadInnerXml(xmlTextReaderPtr reader); + xmlTextReaderReadInnerXml(xmlTextReader *reader); XMLPUBFUN xmlChar * - xmlTextReaderReadOuterXml(xmlTextReaderPtr reader); + xmlTextReaderReadOuterXml(xmlTextReader *reader); #endif XMLPUBFUN xmlChar * - xmlTextReaderReadString (xmlTextReaderPtr reader); + xmlTextReaderReadString (xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderReadAttributeValue(xmlTextReaderPtr reader); + xmlTextReaderReadAttributeValue(xmlTextReader *reader); /* * Attributes of the node */ XMLPUBFUN int - xmlTextReaderAttributeCount(xmlTextReaderPtr reader); + xmlTextReaderAttributeCount(xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderDepth (xmlTextReaderPtr reader); + xmlTextReaderDepth (xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderHasAttributes(xmlTextReaderPtr reader); + xmlTextReaderHasAttributes(xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderHasValue(xmlTextReaderPtr reader); + xmlTextReaderHasValue(xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderIsDefault (xmlTextReaderPtr reader); + xmlTextReaderIsDefault (xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderIsEmptyElement(xmlTextReaderPtr reader); + xmlTextReaderIsEmptyElement(xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderNodeType (xmlTextReaderPtr reader); + xmlTextReaderNodeType (xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderQuoteChar (xmlTextReaderPtr reader); + xmlTextReaderQuoteChar (xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderReadState (xmlTextReaderPtr reader); + xmlTextReaderReadState (xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderIsNamespaceDecl(xmlTextReaderPtr reader); + xmlTextReaderIsNamespaceDecl(xmlTextReader *reader); XMLPUBFUN const xmlChar * - xmlTextReaderConstBaseUri (xmlTextReaderPtr reader); + xmlTextReaderConstBaseUri (xmlTextReader *reader); XMLPUBFUN const xmlChar * - xmlTextReaderConstLocalName (xmlTextReaderPtr reader); + xmlTextReaderConstLocalName (xmlTextReader *reader); XMLPUBFUN const xmlChar * - xmlTextReaderConstName (xmlTextReaderPtr reader); + xmlTextReaderConstName (xmlTextReader *reader); XMLPUBFUN const xmlChar * - xmlTextReaderConstNamespaceUri(xmlTextReaderPtr reader); + xmlTextReaderConstNamespaceUri(xmlTextReader *reader); XMLPUBFUN const xmlChar * - xmlTextReaderConstPrefix (xmlTextReaderPtr reader); + xmlTextReaderConstPrefix (xmlTextReader *reader); XMLPUBFUN const xmlChar * - xmlTextReaderConstXmlLang (xmlTextReaderPtr reader); + xmlTextReaderConstXmlLang (xmlTextReader *reader); XMLPUBFUN const xmlChar * - xmlTextReaderConstString (xmlTextReaderPtr reader, + xmlTextReaderConstString (xmlTextReader *reader, const xmlChar *str); XMLPUBFUN const xmlChar * - xmlTextReaderConstValue (xmlTextReaderPtr reader); + xmlTextReaderConstValue (xmlTextReader *reader); /* * use the Const version of the routine for * better performance and simpler code */ XMLPUBFUN xmlChar * - xmlTextReaderBaseUri (xmlTextReaderPtr reader); + xmlTextReaderBaseUri (xmlTextReader *reader); XMLPUBFUN xmlChar * - xmlTextReaderLocalName (xmlTextReaderPtr reader); + xmlTextReaderLocalName (xmlTextReader *reader); XMLPUBFUN xmlChar * - xmlTextReaderName (xmlTextReaderPtr reader); + xmlTextReaderName (xmlTextReader *reader); XMLPUBFUN xmlChar * - xmlTextReaderNamespaceUri(xmlTextReaderPtr reader); + xmlTextReaderNamespaceUri(xmlTextReader *reader); XMLPUBFUN xmlChar * - xmlTextReaderPrefix (xmlTextReaderPtr reader); + xmlTextReaderPrefix (xmlTextReader *reader); XMLPUBFUN xmlChar * - xmlTextReaderXmlLang (xmlTextReaderPtr reader); + xmlTextReaderXmlLang (xmlTextReader *reader); XMLPUBFUN xmlChar * - xmlTextReaderValue (xmlTextReaderPtr reader); + xmlTextReaderValue (xmlTextReader *reader); /* * Methods of the XmlTextReader */ XMLPUBFUN int - xmlTextReaderClose (xmlTextReaderPtr reader); + xmlTextReaderClose (xmlTextReader *reader); XMLPUBFUN xmlChar * - xmlTextReaderGetAttributeNo (xmlTextReaderPtr reader, + xmlTextReaderGetAttributeNo (xmlTextReader *reader, int no); XMLPUBFUN xmlChar * - xmlTextReaderGetAttribute (xmlTextReaderPtr reader, + xmlTextReaderGetAttribute (xmlTextReader *reader, const xmlChar *name); XMLPUBFUN xmlChar * - xmlTextReaderGetAttributeNs (xmlTextReaderPtr reader, + xmlTextReaderGetAttributeNs (xmlTextReader *reader, const xmlChar *localName, const xmlChar *namespaceURI); -XMLPUBFUN xmlParserInputBufferPtr - xmlTextReaderGetRemainder (xmlTextReaderPtr reader); +XMLPUBFUN xmlParserInputBuffer * + xmlTextReaderGetRemainder (xmlTextReader *reader); XMLPUBFUN xmlChar * - xmlTextReaderLookupNamespace(xmlTextReaderPtr reader, + xmlTextReaderLookupNamespace(xmlTextReader *reader, const xmlChar *prefix); XMLPUBFUN int - xmlTextReaderMoveToAttributeNo(xmlTextReaderPtr reader, + xmlTextReaderMoveToAttributeNo(xmlTextReader *reader, int no); XMLPUBFUN int - xmlTextReaderMoveToAttribute(xmlTextReaderPtr reader, + xmlTextReaderMoveToAttribute(xmlTextReader *reader, const xmlChar *name); XMLPUBFUN int - xmlTextReaderMoveToAttributeNs(xmlTextReaderPtr reader, + xmlTextReaderMoveToAttributeNs(xmlTextReader *reader, const xmlChar *localName, const xmlChar *namespaceURI); XMLPUBFUN int - xmlTextReaderMoveToFirstAttribute(xmlTextReaderPtr reader); + xmlTextReaderMoveToFirstAttribute(xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderMoveToNextAttribute(xmlTextReaderPtr reader); + xmlTextReaderMoveToNextAttribute(xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderMoveToElement (xmlTextReaderPtr reader); + xmlTextReaderMoveToElement (xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderNormalization (xmlTextReaderPtr reader); + xmlTextReaderNormalization (xmlTextReader *reader); XMLPUBFUN const xmlChar * - xmlTextReaderConstEncoding (xmlTextReaderPtr reader); + xmlTextReaderConstEncoding (xmlTextReader *reader); /* * Extensions */ XMLPUBFUN int - xmlTextReaderSetParserProp (xmlTextReaderPtr reader, + xmlTextReaderSetParserProp (xmlTextReader *reader, int prop, int value); XMLPUBFUN int - xmlTextReaderGetParserProp (xmlTextReaderPtr reader, + xmlTextReaderGetParserProp (xmlTextReader *reader, int prop); -XMLPUBFUN xmlNodePtr - xmlTextReaderCurrentNode (xmlTextReaderPtr reader); +XMLPUBFUN xmlNode * + xmlTextReaderCurrentNode (xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderGetParserLineNumber(xmlTextReaderPtr reader); + xmlTextReaderGetParserLineNumber(xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderGetParserColumnNumber(xmlTextReaderPtr reader); + xmlTextReaderGetParserColumnNumber(xmlTextReader *reader); -XMLPUBFUN xmlNodePtr - xmlTextReaderPreserve (xmlTextReaderPtr reader); +XMLPUBFUN xmlNode * + xmlTextReaderPreserve (xmlTextReader *reader); #ifdef LIBXML_PATTERN_ENABLED XMLPUBFUN int - xmlTextReaderPreservePattern(xmlTextReaderPtr reader, + xmlTextReaderPreservePattern(xmlTextReader *reader, const xmlChar *pattern, const xmlChar **namespaces); #endif /* LIBXML_PATTERN_ENABLED */ -XMLPUBFUN xmlDocPtr - xmlTextReaderCurrentDoc (xmlTextReaderPtr reader); -XMLPUBFUN xmlNodePtr - xmlTextReaderExpand (xmlTextReaderPtr reader); +XMLPUBFUN xmlDoc * + xmlTextReaderCurrentDoc (xmlTextReader *reader); +XMLPUBFUN xmlNode * + xmlTextReaderExpand (xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderNext (xmlTextReaderPtr reader); + xmlTextReaderNext (xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderNextSibling (xmlTextReaderPtr reader); + xmlTextReaderNextSibling (xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderIsValid (xmlTextReaderPtr reader); + xmlTextReaderIsValid (xmlTextReader *reader); #ifdef LIBXML_RELAXNG_ENABLED XMLPUBFUN int - xmlTextReaderRelaxNGValidate(xmlTextReaderPtr reader, + xmlTextReaderRelaxNGValidate(xmlTextReader *reader, const char *rng); XMLPUBFUN int - xmlTextReaderRelaxNGValidateCtxt(xmlTextReaderPtr reader, - xmlRelaxNGValidCtxtPtr ctxt, + xmlTextReaderRelaxNGValidateCtxt(xmlTextReader *reader, + xmlRelaxNGValidCtxt *ctxt, int options); XMLPUBFUN int - xmlTextReaderRelaxNGSetSchema(xmlTextReaderPtr reader, - xmlRelaxNGPtr schema); + xmlTextReaderRelaxNGSetSchema(xmlTextReader *reader, + xmlRelaxNG *schema); #endif #ifdef LIBXML_SCHEMAS_ENABLED XMLPUBFUN int - xmlTextReaderSchemaValidate (xmlTextReaderPtr reader, + xmlTextReaderSchemaValidate (xmlTextReader *reader, const char *xsd); XMLPUBFUN int - xmlTextReaderSchemaValidateCtxt(xmlTextReaderPtr reader, - xmlSchemaValidCtxtPtr ctxt, + xmlTextReaderSchemaValidateCtxt(xmlTextReader *reader, + xmlSchemaValidCtxt *ctxt, int options); XMLPUBFUN int - xmlTextReaderSetSchema (xmlTextReaderPtr reader, - xmlSchemaPtr schema); + xmlTextReaderSetSchema (xmlTextReader *reader, + xmlSchema *schema); #endif XMLPUBFUN const xmlChar * - xmlTextReaderConstXmlVersion(xmlTextReaderPtr reader); + xmlTextReaderConstXmlVersion(xmlTextReader *reader); XMLPUBFUN int - xmlTextReaderStandalone (xmlTextReaderPtr reader); + xmlTextReaderStandalone (xmlTextReader *reader); /* * Index lookup */ XMLPUBFUN long - xmlTextReaderByteConsumed (xmlTextReaderPtr reader); + xmlTextReaderByteConsumed (xmlTextReader *reader); /* * New more complete APIs for simpler creation and reuse of readers */ -XMLPUBFUN xmlTextReaderPtr - xmlReaderWalker (xmlDocPtr doc); -XMLPUBFUN xmlTextReaderPtr +XMLPUBFUN xmlTextReader * + xmlReaderWalker (xmlDoc *doc); +XMLPUBFUN xmlTextReader * xmlReaderForDoc (const xmlChar * cur, const char *URL, const char *encoding, int options); -XMLPUBFUN xmlTextReaderPtr +XMLPUBFUN xmlTextReader * xmlReaderForFile (const char *filename, const char *encoding, int options); -XMLPUBFUN xmlTextReaderPtr +XMLPUBFUN xmlTextReader * xmlReaderForMemory (const char *buffer, int size, const char *URL, const char *encoding, int options); -XMLPUBFUN xmlTextReaderPtr +XMLPUBFUN xmlTextReader * xmlReaderForFd (int fd, const char *URL, const char *encoding, int options); -XMLPUBFUN xmlTextReaderPtr +XMLPUBFUN xmlTextReader * xmlReaderForIO (xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void *ioctx, @@ -373,34 +373,34 @@ XMLPUBFUN xmlTextReaderPtr int options); XMLPUBFUN int - xmlReaderNewWalker (xmlTextReaderPtr reader, - xmlDocPtr doc); + xmlReaderNewWalker (xmlTextReader *reader, + xmlDoc *doc); XMLPUBFUN int - xmlReaderNewDoc (xmlTextReaderPtr reader, + xmlReaderNewDoc (xmlTextReader *reader, const xmlChar * cur, const char *URL, const char *encoding, int options); XMLPUBFUN int - xmlReaderNewFile (xmlTextReaderPtr reader, + xmlReaderNewFile (xmlTextReader *reader, const char *filename, const char *encoding, int options); XMLPUBFUN int - xmlReaderNewMemory (xmlTextReaderPtr reader, + xmlReaderNewMemory (xmlTextReader *reader, const char *buffer, int size, const char *URL, const char *encoding, int options); XMLPUBFUN int - xmlReaderNewFd (xmlTextReaderPtr reader, + xmlReaderNewFd (xmlTextReader *reader, int fd, const char *URL, const char *encoding, int options); XMLPUBFUN int - xmlReaderNewIO (xmlTextReaderPtr reader, + xmlReaderNewIO (xmlTextReader *reader, xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void *ioctx, @@ -429,20 +429,20 @@ XMLPUBFUN int XMLPUBFUN xmlChar * xmlTextReaderLocatorBaseURI (xmlTextReaderLocatorPtr locator); XMLPUBFUN void - xmlTextReaderSetErrorHandler(xmlTextReaderPtr reader, + xmlTextReaderSetErrorHandler(xmlTextReader *reader, xmlTextReaderErrorFunc f, void *arg); XMLPUBFUN void - xmlTextReaderSetStructuredErrorHandler(xmlTextReaderPtr reader, + xmlTextReaderSetStructuredErrorHandler(xmlTextReader *reader, xmlStructuredErrorFunc f, void *arg); XMLPUBFUN void - xmlTextReaderGetErrorHandler(xmlTextReaderPtr reader, + xmlTextReaderGetErrorHandler(xmlTextReader *reader, xmlTextReaderErrorFunc *f, void **arg); XMLPUBFUN void - xmlTextReaderSetResourceLoader(xmlTextReaderPtr reader, + xmlTextReaderSetResourceLoader(xmlTextReader *reader, xmlResourceLoader loader, void *data); diff --git a/include/libxml/xmlregexp.h b/include/libxml/xmlregexp.h index 02be1302..7a97d9be 100644 --- a/include/libxml/xmlregexp.h +++ b/include/libxml/xmlregexp.h @@ -40,18 +40,18 @@ typedef xmlRegExecCtxt *xmlRegExecCtxtPtr; /* * The POSIX like API */ -XMLPUBFUN xmlRegexpPtr +XMLPUBFUN xmlRegexp * xmlRegexpCompile (const xmlChar *regexp); -XMLPUBFUN void xmlRegFreeRegexp(xmlRegexpPtr regexp); +XMLPUBFUN void xmlRegFreeRegexp(xmlRegexp *regexp); XMLPUBFUN int - xmlRegexpExec (xmlRegexpPtr comp, + xmlRegexpExec (xmlRegexp *comp, const xmlChar *value); XML_DEPRECATED XMLPUBFUN void xmlRegexpPrint (FILE *output, - xmlRegexpPtr regexp); + xmlRegexp *regexp); XMLPUBFUN int - xmlRegexpIsDeterminist(xmlRegexpPtr comp); + xmlRegexpIsDeterminist(xmlRegexp *comp); /** * Callback function when doing a transition in the automata @@ -61,7 +61,7 @@ XMLPUBFUN int * @param transdata transition data * @param inputdata input data */ -typedef void (*xmlRegExecCallbacks) (xmlRegExecCtxtPtr exec, +typedef void (*xmlRegExecCallbacks) (xmlRegExecCtxt *exec, const xmlChar *token, void *transdata, void *inputdata); @@ -70,35 +70,35 @@ typedef void (*xmlRegExecCallbacks) (xmlRegExecCtxtPtr exec, * The progressive API */ XML_DEPRECATED -XMLPUBFUN xmlRegExecCtxtPtr - xmlRegNewExecCtxt (xmlRegexpPtr comp, +XMLPUBFUN xmlRegExecCtxt * + xmlRegNewExecCtxt (xmlRegexp *comp, xmlRegExecCallbacks callback, void *data); XML_DEPRECATED XMLPUBFUN void - xmlRegFreeExecCtxt (xmlRegExecCtxtPtr exec); + xmlRegFreeExecCtxt (xmlRegExecCtxt *exec); XML_DEPRECATED XMLPUBFUN int - xmlRegExecPushString(xmlRegExecCtxtPtr exec, + xmlRegExecPushString(xmlRegExecCtxt *exec, const xmlChar *value, void *data); XML_DEPRECATED XMLPUBFUN int - xmlRegExecPushString2(xmlRegExecCtxtPtr exec, + xmlRegExecPushString2(xmlRegExecCtxt *exec, const xmlChar *value, const xmlChar *value2, void *data); XML_DEPRECATED XMLPUBFUN int - xmlRegExecNextValues(xmlRegExecCtxtPtr exec, + xmlRegExecNextValues(xmlRegExecCtxt *exec, int *nbval, int *nbneg, xmlChar **values, int *terminal); XML_DEPRECATED XMLPUBFUN int - xmlRegExecErrInfo (xmlRegExecCtxtPtr exec, + xmlRegExecErrInfo (xmlRegExecCtxt *exec, const xmlChar **string, int *nbval, int *nbneg, diff --git a/include/libxml/xmlsave.h b/include/libxml/xmlsave.h index cc93f235..b4c5b212 100644 --- a/include/libxml/xmlsave.h +++ b/include/libxml/xmlsave.h @@ -89,21 +89,21 @@ typedef enum { typedef struct _xmlSaveCtxt xmlSaveCtxt; typedef xmlSaveCtxt *xmlSaveCtxtPtr; -XMLPUBFUN xmlSaveCtxtPtr +XMLPUBFUN xmlSaveCtxt * xmlSaveToFd (int fd, const char *encoding, int options); -XMLPUBFUN xmlSaveCtxtPtr +XMLPUBFUN xmlSaveCtxt * xmlSaveToFilename (const char *filename, const char *encoding, int options); -XMLPUBFUN xmlSaveCtxtPtr - xmlSaveToBuffer (xmlBufferPtr buffer, +XMLPUBFUN xmlSaveCtxt * + xmlSaveToBuffer (xmlBuffer *buffer, const char *encoding, int options); -XMLPUBFUN xmlSaveCtxtPtr +XMLPUBFUN xmlSaveCtxt * xmlSaveToIO (xmlOutputWriteCallback iowrite, xmlOutputCloseCallback ioclose, void *ioctx, @@ -111,28 +111,28 @@ XMLPUBFUN xmlSaveCtxtPtr int options); XMLPUBFUN long - xmlSaveDoc (xmlSaveCtxtPtr ctxt, - xmlDocPtr doc); + xmlSaveDoc (xmlSaveCtxt *ctxt, + xmlDoc *doc); XMLPUBFUN long - xmlSaveTree (xmlSaveCtxtPtr ctxt, - xmlNodePtr node); + xmlSaveTree (xmlSaveCtxt *ctxt, + xmlNode *node); XMLPUBFUN int - xmlSaveFlush (xmlSaveCtxtPtr ctxt); + xmlSaveFlush (xmlSaveCtxt *ctxt); XMLPUBFUN int - xmlSaveClose (xmlSaveCtxtPtr ctxt); + xmlSaveClose (xmlSaveCtxt *ctxt); XMLPUBFUN xmlParserErrors - xmlSaveFinish (xmlSaveCtxtPtr ctxt); + xmlSaveFinish (xmlSaveCtxt *ctxt); XMLPUBFUN int - xmlSaveSetIndentString (xmlSaveCtxtPtr ctxt, + xmlSaveSetIndentString (xmlSaveCtxt *ctxt, const char *indent); XML_DEPRECATED XMLPUBFUN int - xmlSaveSetEscape (xmlSaveCtxtPtr ctxt, + xmlSaveSetEscape (xmlSaveCtxt *ctxt, xmlCharEncodingOutputFunc escape); XML_DEPRECATED XMLPUBFUN int - xmlSaveSetAttrEscape (xmlSaveCtxtPtr ctxt, + xmlSaveSetAttrEscape (xmlSaveCtxt *ctxt, xmlCharEncodingOutputFunc escape); XML_DEPRECATED diff --git a/include/libxml/xmlschemas.h b/include/libxml/xmlschemas.h index 4bbdf9ac..4b4f62f7 100644 --- a/include/libxml/xmlschemas.h +++ b/include/libxml/xmlschemas.h @@ -135,94 +135,94 @@ typedef int (*xmlSchemaValidityLocatorFunc) (void *ctx, /* * Interfaces for parsing. */ -XMLPUBFUN xmlSchemaParserCtxtPtr +XMLPUBFUN xmlSchemaParserCtxt * xmlSchemaNewParserCtxt (const char *URL); -XMLPUBFUN xmlSchemaParserCtxtPtr +XMLPUBFUN xmlSchemaParserCtxt * xmlSchemaNewMemParserCtxt (const char *buffer, int size); -XMLPUBFUN xmlSchemaParserCtxtPtr - xmlSchemaNewDocParserCtxt (xmlDocPtr doc); +XMLPUBFUN xmlSchemaParserCtxt * + xmlSchemaNewDocParserCtxt (xmlDoc *doc); XMLPUBFUN void - xmlSchemaFreeParserCtxt (xmlSchemaParserCtxtPtr ctxt); + xmlSchemaFreeParserCtxt (xmlSchemaParserCtxt *ctxt); XMLPUBFUN void - xmlSchemaSetParserErrors (xmlSchemaParserCtxtPtr ctxt, + xmlSchemaSetParserErrors (xmlSchemaParserCtxt *ctxt, xmlSchemaValidityErrorFunc err, xmlSchemaValidityWarningFunc warn, void *ctx); XMLPUBFUN void - xmlSchemaSetParserStructuredErrors(xmlSchemaParserCtxtPtr ctxt, + xmlSchemaSetParserStructuredErrors(xmlSchemaParserCtxt *ctxt, xmlStructuredErrorFunc serror, void *ctx); XMLPUBFUN int - xmlSchemaGetParserErrors (xmlSchemaParserCtxtPtr ctxt, + xmlSchemaGetParserErrors (xmlSchemaParserCtxt *ctxt, xmlSchemaValidityErrorFunc * err, xmlSchemaValidityWarningFunc * warn, void **ctx); XMLPUBFUN void - xmlSchemaSetResourceLoader (xmlSchemaParserCtxtPtr ctxt, + xmlSchemaSetResourceLoader (xmlSchemaParserCtxt *ctxt, xmlResourceLoader loader, void *data); XMLPUBFUN int - xmlSchemaIsValid (xmlSchemaValidCtxtPtr ctxt); + xmlSchemaIsValid (xmlSchemaValidCtxt *ctxt); -XMLPUBFUN xmlSchemaPtr - xmlSchemaParse (xmlSchemaParserCtxtPtr ctxt); +XMLPUBFUN xmlSchema * + xmlSchemaParse (xmlSchemaParserCtxt *ctxt); XMLPUBFUN void - xmlSchemaFree (xmlSchemaPtr schema); + xmlSchemaFree (xmlSchema *schema); #ifdef LIBXML_DEBUG_ENABLED XMLPUBFUN void xmlSchemaDump (FILE *output, - xmlSchemaPtr schema); + xmlSchema *schema); #endif /* LIBXML_DEBUG_ENABLED */ /* * Interfaces for validating */ XMLPUBFUN void - xmlSchemaSetValidErrors (xmlSchemaValidCtxtPtr ctxt, + xmlSchemaSetValidErrors (xmlSchemaValidCtxt *ctxt, xmlSchemaValidityErrorFunc err, xmlSchemaValidityWarningFunc warn, void *ctx); XMLPUBFUN void - xmlSchemaSetValidStructuredErrors(xmlSchemaValidCtxtPtr ctxt, + xmlSchemaSetValidStructuredErrors(xmlSchemaValidCtxt *ctxt, xmlStructuredErrorFunc serror, void *ctx); XMLPUBFUN int - xmlSchemaGetValidErrors (xmlSchemaValidCtxtPtr ctxt, + xmlSchemaGetValidErrors (xmlSchemaValidCtxt *ctxt, xmlSchemaValidityErrorFunc *err, xmlSchemaValidityWarningFunc *warn, void **ctx); XMLPUBFUN int - xmlSchemaSetValidOptions (xmlSchemaValidCtxtPtr ctxt, + xmlSchemaSetValidOptions (xmlSchemaValidCtxt *ctxt, int options); XMLPUBFUN void - xmlSchemaValidateSetFilename(xmlSchemaValidCtxtPtr vctxt, + xmlSchemaValidateSetFilename(xmlSchemaValidCtxt *vctxt, const char *filename); XMLPUBFUN int - xmlSchemaValidCtxtGetOptions(xmlSchemaValidCtxtPtr ctxt); + xmlSchemaValidCtxtGetOptions(xmlSchemaValidCtxt *ctxt); -XMLPUBFUN xmlSchemaValidCtxtPtr - xmlSchemaNewValidCtxt (xmlSchemaPtr schema); +XMLPUBFUN xmlSchemaValidCtxt * + xmlSchemaNewValidCtxt (xmlSchema *schema); XMLPUBFUN void - xmlSchemaFreeValidCtxt (xmlSchemaValidCtxtPtr ctxt); + xmlSchemaFreeValidCtxt (xmlSchemaValidCtxt *ctxt); XMLPUBFUN int - xmlSchemaValidateDoc (xmlSchemaValidCtxtPtr ctxt, - xmlDocPtr instance); + xmlSchemaValidateDoc (xmlSchemaValidCtxt *ctxt, + xmlDoc *instance); XMLPUBFUN int - xmlSchemaValidateOneElement (xmlSchemaValidCtxtPtr ctxt, - xmlNodePtr elem); + xmlSchemaValidateOneElement (xmlSchemaValidCtxt *ctxt, + xmlNode *elem); XMLPUBFUN int - xmlSchemaValidateStream (xmlSchemaValidCtxtPtr ctxt, - xmlParserInputBufferPtr input, + xmlSchemaValidateStream (xmlSchemaValidCtxt *ctxt, + xmlParserInputBuffer *input, xmlCharEncoding enc, const xmlSAXHandler *sax, void *user_data); XMLPUBFUN int - xmlSchemaValidateFile (xmlSchemaValidCtxtPtr ctxt, + xmlSchemaValidateFile (xmlSchemaValidCtxt *ctxt, const char * filename, int options); -XMLPUBFUN xmlParserCtxtPtr - xmlSchemaValidCtxtGetParserCtxt(xmlSchemaValidCtxtPtr ctxt); +XMLPUBFUN xmlParserCtxt * + xmlSchemaValidCtxtGetParserCtxt(xmlSchemaValidCtxt *ctxt); /* * Interface to insert Schemas SAX validation in a SAX stream @@ -230,16 +230,16 @@ XMLPUBFUN xmlParserCtxtPtr typedef struct _xmlSchemaSAXPlug xmlSchemaSAXPlugStruct; typedef xmlSchemaSAXPlugStruct *xmlSchemaSAXPlugPtr; -XMLPUBFUN xmlSchemaSAXPlugPtr - xmlSchemaSAXPlug (xmlSchemaValidCtxtPtr ctxt, - xmlSAXHandlerPtr *sax, +XMLPUBFUN xmlSchemaSAXPlugStruct * + xmlSchemaSAXPlug (xmlSchemaValidCtxt *ctxt, + xmlSAXHandler **sax, void **user_data); XMLPUBFUN int - xmlSchemaSAXUnplug (xmlSchemaSAXPlugPtr plug); + xmlSchemaSAXUnplug (xmlSchemaSAXPlugStruct *plug); XMLPUBFUN void - xmlSchemaValidateSetLocator (xmlSchemaValidCtxtPtr vctxt, + xmlSchemaValidateSetLocator (xmlSchemaValidCtxt *vctxt, xmlSchemaValidityLocatorFunc f, void *ctxt); diff --git a/include/libxml/xmlschemastypes.h b/include/libxml/xmlschemastypes.h index 1855c16d..35b2abea 100644 --- a/include/libxml/xmlschemastypes.h +++ b/include/libxml/xmlschemastypes.h @@ -41,114 +41,114 @@ XMLPUBFUN int XML_DEPRECATED XMLPUBFUN void xmlSchemaCleanupTypes (void); -XMLPUBFUN xmlSchemaTypePtr +XMLPUBFUN xmlSchemaType * xmlSchemaGetPredefinedType (const xmlChar *name, const xmlChar *ns); XMLPUBFUN int - xmlSchemaValidatePredefinedType (xmlSchemaTypePtr type, + xmlSchemaValidatePredefinedType (xmlSchemaType *type, const xmlChar *value, - xmlSchemaValPtr *val); + xmlSchemaVal **val); XMLPUBFUN int - xmlSchemaValPredefTypeNode (xmlSchemaTypePtr type, + xmlSchemaValPredefTypeNode (xmlSchemaType *type, const xmlChar *value, - xmlSchemaValPtr *val, - xmlNodePtr node); + xmlSchemaVal **val, + xmlNode *node); XMLPUBFUN int - xmlSchemaValidateFacet (xmlSchemaTypePtr base, - xmlSchemaFacetPtr facet, + xmlSchemaValidateFacet (xmlSchemaType *base, + xmlSchemaFacet *facet, const xmlChar *value, - xmlSchemaValPtr val); + xmlSchemaVal *val); XMLPUBFUN int - xmlSchemaValidateFacetWhtsp (xmlSchemaFacetPtr facet, + xmlSchemaValidateFacetWhtsp (xmlSchemaFacet *facet, xmlSchemaWhitespaceValueType fws, xmlSchemaValType valType, const xmlChar *value, - xmlSchemaValPtr val, + xmlSchemaVal *val, xmlSchemaWhitespaceValueType ws); XMLPUBFUN void - xmlSchemaFreeValue (xmlSchemaValPtr val); -XMLPUBFUN xmlSchemaFacetPtr + xmlSchemaFreeValue (xmlSchemaVal *val); +XMLPUBFUN xmlSchemaFacet * xmlSchemaNewFacet (void); XMLPUBFUN int - xmlSchemaCheckFacet (xmlSchemaFacetPtr facet, - xmlSchemaTypePtr typeDecl, - xmlSchemaParserCtxtPtr ctxt, + xmlSchemaCheckFacet (xmlSchemaFacet *facet, + xmlSchemaType *typeDecl, + xmlSchemaParserCtxt *ctxt, const xmlChar *name); XMLPUBFUN void - xmlSchemaFreeFacet (xmlSchemaFacetPtr facet); + xmlSchemaFreeFacet (xmlSchemaFacet *facet); XMLPUBFUN int - xmlSchemaCompareValues (xmlSchemaValPtr x, - xmlSchemaValPtr y); -XMLPUBFUN xmlSchemaTypePtr - xmlSchemaGetBuiltInListSimpleTypeItemType (xmlSchemaTypePtr type); + xmlSchemaCompareValues (xmlSchemaVal *x, + xmlSchemaVal *y); +XMLPUBFUN xmlSchemaType * + xmlSchemaGetBuiltInListSimpleTypeItemType (xmlSchemaType *type); XMLPUBFUN int - xmlSchemaValidateListSimpleTypeFacet (xmlSchemaFacetPtr facet, + xmlSchemaValidateListSimpleTypeFacet (xmlSchemaFacet *facet, const xmlChar *value, unsigned long actualLen, unsigned long *expectedLen); -XMLPUBFUN xmlSchemaTypePtr +XMLPUBFUN xmlSchemaType * xmlSchemaGetBuiltInType (xmlSchemaValType type); XMLPUBFUN int - xmlSchemaIsBuiltInTypeFacet (xmlSchemaTypePtr type, + xmlSchemaIsBuiltInTypeFacet (xmlSchemaType *type, int facetType); XMLPUBFUN xmlChar * xmlSchemaCollapseString (const xmlChar *value); XMLPUBFUN xmlChar * xmlSchemaWhiteSpaceReplace (const xmlChar *value); XMLPUBFUN unsigned long - xmlSchemaGetFacetValueAsULong (xmlSchemaFacetPtr facet); + xmlSchemaGetFacetValueAsULong (xmlSchemaFacet *facet); XMLPUBFUN int - xmlSchemaValidateLengthFacet (xmlSchemaTypePtr type, - xmlSchemaFacetPtr facet, + xmlSchemaValidateLengthFacet (xmlSchemaType *type, + xmlSchemaFacet *facet, const xmlChar *value, - xmlSchemaValPtr val, + xmlSchemaVal *val, unsigned long *length); XMLPUBFUN int - xmlSchemaValidateLengthFacetWhtsp(xmlSchemaFacetPtr facet, + xmlSchemaValidateLengthFacetWhtsp(xmlSchemaFacet *facet, xmlSchemaValType valType, const xmlChar *value, - xmlSchemaValPtr val, + xmlSchemaVal *val, unsigned long *length, xmlSchemaWhitespaceValueType ws); XMLPUBFUN int - xmlSchemaValPredefTypeNodeNoNorm(xmlSchemaTypePtr type, + xmlSchemaValPredefTypeNodeNoNorm(xmlSchemaType *type, const xmlChar *value, - xmlSchemaValPtr *val, - xmlNodePtr node); + xmlSchemaVal **val, + xmlNode *node); XMLPUBFUN int - xmlSchemaGetCanonValue (xmlSchemaValPtr val, + xmlSchemaGetCanonValue (xmlSchemaVal *val, const xmlChar **retValue); XMLPUBFUN int - xmlSchemaGetCanonValueWhtsp (xmlSchemaValPtr val, + xmlSchemaGetCanonValueWhtsp (xmlSchemaVal *val, const xmlChar **retValue, xmlSchemaWhitespaceValueType ws); XMLPUBFUN int - xmlSchemaValueAppend (xmlSchemaValPtr prev, - xmlSchemaValPtr cur); -XMLPUBFUN xmlSchemaValPtr - xmlSchemaValueGetNext (xmlSchemaValPtr cur); + xmlSchemaValueAppend (xmlSchemaVal *prev, + xmlSchemaVal *cur); +XMLPUBFUN xmlSchemaVal * + xmlSchemaValueGetNext (xmlSchemaVal *cur); XMLPUBFUN const xmlChar * - xmlSchemaValueGetAsString (xmlSchemaValPtr val); + xmlSchemaValueGetAsString (xmlSchemaVal *val); XMLPUBFUN int - xmlSchemaValueGetAsBoolean (xmlSchemaValPtr val); -XMLPUBFUN xmlSchemaValPtr + xmlSchemaValueGetAsBoolean (xmlSchemaVal *val); +XMLPUBFUN xmlSchemaVal * xmlSchemaNewStringValue (xmlSchemaValType type, const xmlChar *value); -XMLPUBFUN xmlSchemaValPtr +XMLPUBFUN xmlSchemaVal * xmlSchemaNewNOTATIONValue (const xmlChar *name, const xmlChar *ns); -XMLPUBFUN xmlSchemaValPtr +XMLPUBFUN xmlSchemaVal * xmlSchemaNewQNameValue (const xmlChar *namespaceName, const xmlChar *localName); XMLPUBFUN int - xmlSchemaCompareValuesWhtsp (xmlSchemaValPtr x, + xmlSchemaCompareValuesWhtsp (xmlSchemaVal *x, xmlSchemaWhitespaceValueType xws, - xmlSchemaValPtr y, + xmlSchemaVal *y, xmlSchemaWhitespaceValueType yws); -XMLPUBFUN xmlSchemaValPtr - xmlSchemaCopyValue (xmlSchemaValPtr val); +XMLPUBFUN xmlSchemaVal * + xmlSchemaCopyValue (xmlSchemaVal *val); XMLPUBFUN xmlSchemaValType - xmlSchemaGetValType (xmlSchemaValPtr val); + xmlSchemaGetValType (xmlSchemaVal *val); #ifdef __cplusplus } diff --git a/include/libxml/xmlwriter.h b/include/libxml/xmlwriter.h index 65943556..43993ea5 100644 --- a/include/libxml/xmlwriter.h +++ b/include/libxml/xmlwriter.h @@ -32,20 +32,20 @@ extern "C" { /* * Constructors & Destructor */ - XMLPUBFUN xmlTextWriterPtr - xmlNewTextWriter(xmlOutputBufferPtr out); - XMLPUBFUN xmlTextWriterPtr + XMLPUBFUN xmlTextWriter * + xmlNewTextWriter(xmlOutputBuffer *out); + XMLPUBFUN xmlTextWriter * xmlNewTextWriterFilename(const char *uri, int compression); - XMLPUBFUN xmlTextWriterPtr - xmlNewTextWriterMemory(xmlBufferPtr buf, int compression); - XMLPUBFUN xmlTextWriterPtr - xmlNewTextWriterPushParser(xmlParserCtxtPtr ctxt, int compression); - XMLPUBFUN xmlTextWriterPtr - xmlNewTextWriterDoc(xmlDocPtr * doc, int compression); - XMLPUBFUN xmlTextWriterPtr - xmlNewTextWriterTree(xmlDocPtr doc, xmlNodePtr node, + XMLPUBFUN xmlTextWriter * + xmlNewTextWriterMemory(xmlBuffer *buf, int compression); + XMLPUBFUN xmlTextWriter * + xmlNewTextWriterPushParser(xmlParserCtxt *ctxt, int compression); + XMLPUBFUN xmlTextWriter * + xmlNewTextWriterDoc(xmlDoc ** doc, int compression); + XMLPUBFUN xmlTextWriter * + xmlNewTextWriterTree(xmlDoc *doc, xmlNode *node, int compression); - XMLPUBFUN void xmlFreeTextWriter(xmlTextWriterPtr writer); + XMLPUBFUN void xmlFreeTextWriter(xmlTextWriter *writer); /* * Functions @@ -56,29 +56,29 @@ extern "C" { * Document */ XMLPUBFUN int - xmlTextWriterStartDocument(xmlTextWriterPtr writer, + xmlTextWriterStartDocument(xmlTextWriter *writer, const char *version, const char *encoding, const char *standalone); - XMLPUBFUN int xmlTextWriterEndDocument(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterEndDocument(xmlTextWriter * writer); /* * Comments */ - XMLPUBFUN int xmlTextWriterStartComment(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterStartComment(xmlTextWriter * writer); - XMLPUBFUN int xmlTextWriterEndComment(xmlTextWriterPtr writer); + XMLPUBFUN int xmlTextWriterEndComment(xmlTextWriter *writer); XMLPUBFUN int - xmlTextWriterWriteFormatComment(xmlTextWriterPtr writer, + xmlTextWriterWriteFormatComment(xmlTextWriter *writer, const char *format, ...) LIBXML_ATTR_FORMAT(2,3); XMLPUBFUN int - xmlTextWriterWriteVFormatComment(xmlTextWriterPtr writer, + xmlTextWriterWriteVFormatComment(xmlTextWriter *writer, const char *format, va_list argptr) LIBXML_ATTR_FORMAT(2,0); - XMLPUBFUN int xmlTextWriterWriteComment(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterWriteComment(xmlTextWriter * writer, const xmlChar * content); @@ -87,54 +87,54 @@ extern "C" { * Elements */ XMLPUBFUN int - xmlTextWriterStartElement(xmlTextWriterPtr writer, + xmlTextWriterStartElement(xmlTextWriter *writer, const xmlChar * name); - XMLPUBFUN int xmlTextWriterStartElementNS(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterStartElementNS(xmlTextWriter * writer, const xmlChar * prefix, const xmlChar * name, const xmlChar * namespaceURI); - XMLPUBFUN int xmlTextWriterEndElement(xmlTextWriterPtr writer); - XMLPUBFUN int xmlTextWriterFullEndElement(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterEndElement(xmlTextWriter *writer); + XMLPUBFUN int xmlTextWriterFullEndElement(xmlTextWriter * writer); /* * Elements conveniency functions */ XMLPUBFUN int - xmlTextWriterWriteFormatElement(xmlTextWriterPtr writer, + xmlTextWriterWriteFormatElement(xmlTextWriter *writer, const xmlChar * name, const char *format, ...) LIBXML_ATTR_FORMAT(3,4); XMLPUBFUN int - xmlTextWriterWriteVFormatElement(xmlTextWriterPtr writer, + xmlTextWriterWriteVFormatElement(xmlTextWriter *writer, const xmlChar * name, const char *format, va_list argptr) LIBXML_ATTR_FORMAT(3,0); - XMLPUBFUN int xmlTextWriterWriteElement(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterWriteElement(xmlTextWriter * writer, const xmlChar * name, const xmlChar * content); XMLPUBFUN int - xmlTextWriterWriteFormatElementNS(xmlTextWriterPtr writer, + xmlTextWriterWriteFormatElementNS(xmlTextWriter *writer, const xmlChar * prefix, const xmlChar * name, const xmlChar * namespaceURI, const char *format, ...) LIBXML_ATTR_FORMAT(5,6); XMLPUBFUN int - xmlTextWriterWriteVFormatElementNS(xmlTextWriterPtr writer, + xmlTextWriterWriteVFormatElementNS(xmlTextWriter *writer, const xmlChar * prefix, const xmlChar * name, const xmlChar * namespaceURI, const char *format, va_list argptr) LIBXML_ATTR_FORMAT(5,0); - XMLPUBFUN int xmlTextWriterWriteElementNS(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterWriteElementNS(xmlTextWriter * writer, const xmlChar * prefix, @@ -148,37 +148,37 @@ extern "C" { * Text */ XMLPUBFUN int - xmlTextWriterWriteFormatRaw(xmlTextWriterPtr writer, + xmlTextWriterWriteFormatRaw(xmlTextWriter *writer, const char *format, ...) LIBXML_ATTR_FORMAT(2,3); XMLPUBFUN int - xmlTextWriterWriteVFormatRaw(xmlTextWriterPtr writer, + xmlTextWriterWriteVFormatRaw(xmlTextWriter *writer, const char *format, va_list argptr) LIBXML_ATTR_FORMAT(2,0); XMLPUBFUN int - xmlTextWriterWriteRawLen(xmlTextWriterPtr writer, + xmlTextWriterWriteRawLen(xmlTextWriter *writer, const xmlChar * content, int len); XMLPUBFUN int - xmlTextWriterWriteRaw(xmlTextWriterPtr writer, + xmlTextWriterWriteRaw(xmlTextWriter *writer, const xmlChar * content); - XMLPUBFUN int xmlTextWriterWriteFormatString(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterWriteFormatString(xmlTextWriter * writer, const char *format, ...) LIBXML_ATTR_FORMAT(2,3); - XMLPUBFUN int xmlTextWriterWriteVFormatString(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterWriteVFormatString(xmlTextWriter * writer, const char *format, va_list argptr) LIBXML_ATTR_FORMAT(2,0); - XMLPUBFUN int xmlTextWriterWriteString(xmlTextWriterPtr writer, + XMLPUBFUN int xmlTextWriterWriteString(xmlTextWriter *writer, const xmlChar * content); - XMLPUBFUN int xmlTextWriterWriteBase64(xmlTextWriterPtr writer, + XMLPUBFUN int xmlTextWriterWriteBase64(xmlTextWriter *writer, const char *data, int start, int len); - XMLPUBFUN int xmlTextWriterWriteBinHex(xmlTextWriterPtr writer, + XMLPUBFUN int xmlTextWriterWriteBinHex(xmlTextWriter *writer, const char *data, int start, int len); @@ -186,9 +186,9 @@ extern "C" { * Attributes */ XMLPUBFUN int - xmlTextWriterStartAttribute(xmlTextWriterPtr writer, + xmlTextWriterStartAttribute(xmlTextWriter *writer, const xmlChar * name); - XMLPUBFUN int xmlTextWriterStartAttributeNS(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterStartAttributeNS(xmlTextWriter * writer, const xmlChar * prefix, @@ -196,44 +196,44 @@ extern "C" { name, const xmlChar * namespaceURI); - XMLPUBFUN int xmlTextWriterEndAttribute(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterEndAttribute(xmlTextWriter * writer); /* * Attributes conveniency functions */ XMLPUBFUN int - xmlTextWriterWriteFormatAttribute(xmlTextWriterPtr writer, + xmlTextWriterWriteFormatAttribute(xmlTextWriter *writer, const xmlChar * name, const char *format, ...) LIBXML_ATTR_FORMAT(3,4); XMLPUBFUN int - xmlTextWriterWriteVFormatAttribute(xmlTextWriterPtr writer, + xmlTextWriterWriteVFormatAttribute(xmlTextWriter *writer, const xmlChar * name, const char *format, va_list argptr) LIBXML_ATTR_FORMAT(3,0); - XMLPUBFUN int xmlTextWriterWriteAttribute(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterWriteAttribute(xmlTextWriter * writer, const xmlChar * name, const xmlChar * content); XMLPUBFUN int - xmlTextWriterWriteFormatAttributeNS(xmlTextWriterPtr writer, + xmlTextWriterWriteFormatAttributeNS(xmlTextWriter *writer, const xmlChar * prefix, const xmlChar * name, const xmlChar * namespaceURI, const char *format, ...) LIBXML_ATTR_FORMAT(5,6); XMLPUBFUN int - xmlTextWriterWriteVFormatAttributeNS(xmlTextWriterPtr writer, + xmlTextWriterWriteVFormatAttributeNS(xmlTextWriter *writer, const xmlChar * prefix, const xmlChar * name, const xmlChar * namespaceURI, const char *format, va_list argptr) LIBXML_ATTR_FORMAT(5,0); - XMLPUBFUN int xmlTextWriterWriteAttributeNS(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterWriteAttributeNS(xmlTextWriter * writer, const xmlChar * prefix, @@ -248,25 +248,25 @@ extern "C" { * PI's */ XMLPUBFUN int - xmlTextWriterStartPI(xmlTextWriterPtr writer, + xmlTextWriterStartPI(xmlTextWriter *writer, const xmlChar * target); - XMLPUBFUN int xmlTextWriterEndPI(xmlTextWriterPtr writer); + XMLPUBFUN int xmlTextWriterEndPI(xmlTextWriter *writer); /* * PI conveniency functions */ XMLPUBFUN int - xmlTextWriterWriteFormatPI(xmlTextWriterPtr writer, + xmlTextWriterWriteFormatPI(xmlTextWriter *writer, const xmlChar * target, const char *format, ...) LIBXML_ATTR_FORMAT(3,4); XMLPUBFUN int - xmlTextWriterWriteVFormatPI(xmlTextWriterPtr writer, + xmlTextWriterWriteVFormatPI(xmlTextWriter *writer, const xmlChar * target, const char *format, va_list argptr) LIBXML_ATTR_FORMAT(3,0); XMLPUBFUN int - xmlTextWriterWritePI(xmlTextWriterPtr writer, + xmlTextWriterWritePI(xmlTextWriter *writer, const xmlChar * target, const xmlChar * content); @@ -278,53 +278,53 @@ extern "C" { /* * CDATA */ - XMLPUBFUN int xmlTextWriterStartCDATA(xmlTextWriterPtr writer); - XMLPUBFUN int xmlTextWriterEndCDATA(xmlTextWriterPtr writer); + XMLPUBFUN int xmlTextWriterStartCDATA(xmlTextWriter *writer); + XMLPUBFUN int xmlTextWriterEndCDATA(xmlTextWriter *writer); /* * CDATA conveniency functions */ XMLPUBFUN int - xmlTextWriterWriteFormatCDATA(xmlTextWriterPtr writer, + xmlTextWriterWriteFormatCDATA(xmlTextWriter *writer, const char *format, ...) LIBXML_ATTR_FORMAT(2,3); XMLPUBFUN int - xmlTextWriterWriteVFormatCDATA(xmlTextWriterPtr writer, + xmlTextWriterWriteVFormatCDATA(xmlTextWriter *writer, const char *format, va_list argptr) LIBXML_ATTR_FORMAT(2,0); XMLPUBFUN int - xmlTextWriterWriteCDATA(xmlTextWriterPtr writer, + xmlTextWriterWriteCDATA(xmlTextWriter *writer, const xmlChar * content); /* * DTD */ XMLPUBFUN int - xmlTextWriterStartDTD(xmlTextWriterPtr writer, + xmlTextWriterStartDTD(xmlTextWriter *writer, const xmlChar * name, const xmlChar * pubid, const xmlChar * sysid); - XMLPUBFUN int xmlTextWriterEndDTD(xmlTextWriterPtr writer); + XMLPUBFUN int xmlTextWriterEndDTD(xmlTextWriter *writer); /* * DTD conveniency functions */ XMLPUBFUN int - xmlTextWriterWriteFormatDTD(xmlTextWriterPtr writer, + xmlTextWriterWriteFormatDTD(xmlTextWriter *writer, const xmlChar * name, const xmlChar * pubid, const xmlChar * sysid, const char *format, ...) LIBXML_ATTR_FORMAT(5,6); XMLPUBFUN int - xmlTextWriterWriteVFormatDTD(xmlTextWriterPtr writer, + xmlTextWriterWriteVFormatDTD(xmlTextWriter *writer, const xmlChar * name, const xmlChar * pubid, const xmlChar * sysid, const char *format, va_list argptr) LIBXML_ATTR_FORMAT(5,0); XMLPUBFUN int - xmlTextWriterWriteDTD(xmlTextWriterPtr writer, + xmlTextWriterWriteDTD(xmlTextWriter *writer, const xmlChar * name, const xmlChar * pubid, const xmlChar * sysid, @@ -339,26 +339,26 @@ extern "C" { * DTD element definition */ XMLPUBFUN int - xmlTextWriterStartDTDElement(xmlTextWriterPtr writer, + xmlTextWriterStartDTDElement(xmlTextWriter *writer, const xmlChar * name); - XMLPUBFUN int xmlTextWriterEndDTDElement(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterEndDTDElement(xmlTextWriter * writer); /* * DTD element definition conveniency functions */ XMLPUBFUN int - xmlTextWriterWriteFormatDTDElement(xmlTextWriterPtr writer, + xmlTextWriterWriteFormatDTDElement(xmlTextWriter *writer, const xmlChar * name, const char *format, ...) LIBXML_ATTR_FORMAT(3,4); XMLPUBFUN int - xmlTextWriterWriteVFormatDTDElement(xmlTextWriterPtr writer, + xmlTextWriterWriteVFormatDTDElement(xmlTextWriter *writer, const xmlChar * name, const char *format, va_list argptr) LIBXML_ATTR_FORMAT(3,0); - XMLPUBFUN int xmlTextWriterWriteDTDElement(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterWriteDTDElement(xmlTextWriter * writer, const xmlChar * name, @@ -369,26 +369,26 @@ extern "C" { * DTD attribute list definition */ XMLPUBFUN int - xmlTextWriterStartDTDAttlist(xmlTextWriterPtr writer, + xmlTextWriterStartDTDAttlist(xmlTextWriter *writer, const xmlChar * name); - XMLPUBFUN int xmlTextWriterEndDTDAttlist(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterEndDTDAttlist(xmlTextWriter * writer); /* * DTD attribute list definition conveniency functions */ XMLPUBFUN int - xmlTextWriterWriteFormatDTDAttlist(xmlTextWriterPtr writer, + xmlTextWriterWriteFormatDTDAttlist(xmlTextWriter *writer, const xmlChar * name, const char *format, ...) LIBXML_ATTR_FORMAT(3,4); XMLPUBFUN int - xmlTextWriterWriteVFormatDTDAttlist(xmlTextWriterPtr writer, + xmlTextWriterWriteVFormatDTDAttlist(xmlTextWriter *writer, const xmlChar * name, const char *format, va_list argptr) LIBXML_ATTR_FORMAT(3,0); - XMLPUBFUN int xmlTextWriterWriteDTDAttlist(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterWriteDTDAttlist(xmlTextWriter * writer, const xmlChar * name, @@ -399,47 +399,47 @@ extern "C" { * DTD entity definition */ XMLPUBFUN int - xmlTextWriterStartDTDEntity(xmlTextWriterPtr writer, + xmlTextWriterStartDTDEntity(xmlTextWriter *writer, int pe, const xmlChar * name); - XMLPUBFUN int xmlTextWriterEndDTDEntity(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterEndDTDEntity(xmlTextWriter * writer); /* * DTD entity definition conveniency functions */ XMLPUBFUN int - xmlTextWriterWriteFormatDTDInternalEntity(xmlTextWriterPtr writer, + xmlTextWriterWriteFormatDTDInternalEntity(xmlTextWriter *writer, int pe, const xmlChar * name, const char *format, ...) LIBXML_ATTR_FORMAT(4,5); XMLPUBFUN int - xmlTextWriterWriteVFormatDTDInternalEntity(xmlTextWriterPtr writer, + xmlTextWriterWriteVFormatDTDInternalEntity(xmlTextWriter *writer, int pe, const xmlChar * name, const char *format, va_list argptr) LIBXML_ATTR_FORMAT(4,0); XMLPUBFUN int - xmlTextWriterWriteDTDInternalEntity(xmlTextWriterPtr writer, + xmlTextWriterWriteDTDInternalEntity(xmlTextWriter *writer, int pe, const xmlChar * name, const xmlChar * content); XMLPUBFUN int - xmlTextWriterWriteDTDExternalEntity(xmlTextWriterPtr writer, + xmlTextWriterWriteDTDExternalEntity(xmlTextWriter *writer, int pe, const xmlChar * name, const xmlChar * pubid, const xmlChar * sysid, const xmlChar * ndataid); XMLPUBFUN int - xmlTextWriterWriteDTDExternalEntityContents(xmlTextWriterPtr + xmlTextWriterWriteDTDExternalEntityContents(xmlTextWriter * writer, const xmlChar * pubid, const xmlChar * sysid, const xmlChar * ndataid); - XMLPUBFUN int xmlTextWriterWriteDTDEntity(xmlTextWriterPtr + XMLPUBFUN int xmlTextWriterWriteDTDEntity(xmlTextWriter * writer, int pe, const xmlChar * name, const xmlChar * @@ -455,7 +455,7 @@ extern "C" { * DTD notation definition */ XMLPUBFUN int - xmlTextWriterWriteDTDNotation(xmlTextWriterPtr writer, + xmlTextWriterWriteDTDNotation(xmlTextWriter *writer, const xmlChar * name, const xmlChar * pubid, const xmlChar * sysid); @@ -464,20 +464,20 @@ extern "C" { * Indentation */ XMLPUBFUN int - xmlTextWriterSetIndent(xmlTextWriterPtr writer, int indent); + xmlTextWriterSetIndent(xmlTextWriter *writer, int indent); XMLPUBFUN int - xmlTextWriterSetIndentString(xmlTextWriterPtr writer, + xmlTextWriterSetIndentString(xmlTextWriter *writer, const xmlChar * str); XMLPUBFUN int - xmlTextWriterSetQuoteChar(xmlTextWriterPtr writer, xmlChar quotechar); + xmlTextWriterSetQuoteChar(xmlTextWriter *writer, xmlChar quotechar); /* * misc */ - XMLPUBFUN int xmlTextWriterFlush(xmlTextWriterPtr writer); - XMLPUBFUN int xmlTextWriterClose(xmlTextWriterPtr writer); + XMLPUBFUN int xmlTextWriterFlush(xmlTextWriter *writer); + XMLPUBFUN int xmlTextWriterClose(xmlTextWriter *writer); #ifdef __cplusplus } diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h index 203c667a..e49f2b86 100644 --- a/include/libxml/xpath.h +++ b/include/libxml/xpath.h @@ -84,7 +84,7 @@ struct _xmlNodeSet { /** size of the array as allocated */ int nodeMax; /** array of nodes in no particular order */ - xmlNodePtr *nodeTab; + xmlNode **nodeTab; }; /** @@ -121,7 +121,7 @@ struct _xmlXPathObject { /** object type */ xmlXPathObjectType type; /** node set */ - xmlNodeSetPtr nodesetval; + xmlNodeSet *nodesetval; /** boolean */ int boolval; /** number */ @@ -139,7 +139,7 @@ struct _xmlXPathObject { /* * unused */ -typedef int (*xmlXPathConvertFunc) (xmlXPathObjectPtr obj, int type); +typedef int (*xmlXPathConvertFunc) (xmlXPathObject *obj, int type); typedef struct _xmlXPathType xmlXPathType; typedef xmlXPathType *xmlXPathTypePtr; struct _xmlXPathType { @@ -154,13 +154,13 @@ typedef struct _xmlXPathVariable xmlXPathVariable; typedef xmlXPathVariable *xmlXPathVariablePtr; struct _xmlXPathVariable { const xmlChar *name; /* the variable name */ - xmlXPathObjectPtr value; /* the value */ + xmlXPathObject *value; /* the value */ }; /* * unused */ -typedef void (*xmlXPathEvalFunc)(xmlXPathParserContextPtr ctxt, +typedef void (*xmlXPathEvalFunc)(xmlXPathParserContext *ctxt, int nargs); typedef struct _xmlXPathFunct xmlXPathFunct; typedef xmlXPathFunct *xmlXPathFuncPtr; @@ -172,8 +172,8 @@ struct _xmlXPathFunct { /* * unused */ -typedef xmlXPathObjectPtr (*xmlXPathAxisFunc) (xmlXPathParserContextPtr ctxt, - xmlXPathObjectPtr cur); +typedef xmlXPathObject *(*xmlXPathAxisFunc) (xmlXPathParserContext *ctxt, + xmlXPathObject *cur); typedef struct _xmlXPathAxis xmlXPathAxis; typedef xmlXPathAxis *xmlXPathAxisPtr; struct _xmlXPathAxis { @@ -192,7 +192,7 @@ struct _xmlXPathAxis { * @param nargs the number of arguments */ -typedef void (*xmlXPathFunction) (xmlXPathParserContextPtr ctxt, int nargs); +typedef void (*xmlXPathFunction) (xmlXPathParserContext *ctxt, int nargs); /* * Function and Variable Lookup. @@ -207,7 +207,7 @@ typedef void (*xmlXPathFunction) (xmlXPathParserContextPtr ctxt, int nargs); * @param ns_uri the namespace name hosting this variable * @returns the XPath object value or NULL if not found. */ -typedef xmlXPathObjectPtr (*xmlXPathVariableLookupFunc) (void *ctxt, +typedef xmlXPathObject *(*xmlXPathVariableLookupFunc) (void *ctxt, const xmlChar *name, const xmlChar *ns_uri); @@ -252,40 +252,40 @@ typedef xmlXPathFunction (*xmlXPathFuncLookupFunc) (void *ctxt, */ struct _xmlXPathContext { /** The current document */ - xmlDocPtr doc; + xmlDoc *doc; /** The current node */ - xmlNodePtr node; + xmlNode *node; /* unused (hash table) */ int nb_variables_unused; /* unused (hash table) */ int max_variables_unused; /* Hash table of defined variables */ - xmlHashTablePtr varHash; + xmlHashTable *varHash; /* number of defined types */ int nb_types; /* max number of types */ int max_types; /* Array of defined types */ - xmlXPathTypePtr types; + xmlXPathType *types; /* unused (hash table) */ int nb_funcs_unused; /* unused (hash table) */ int max_funcs_unused; /* Hash table of defined funcs */ - xmlHashTablePtr funcHash; + xmlHashTable *funcHash; /* number of defined axis */ int nb_axis; /* max number of axis */ int max_axis; /* Array of defined axis */ - xmlXPathAxisPtr axis; + xmlXPathAxis *axis; /* Array of namespaces */ - xmlNsPtr *namespaces; + xmlNs **namespaces; /* number of namespace in scope */ int nsNr; /* function to free */ @@ -299,12 +299,12 @@ struct _xmlXPathContext { /* is this an XPointer context? */ int xptr; /* for here() */ - xmlNodePtr here; + xmlNode *here; /* for origin() */ - xmlNodePtr origin; + xmlNode *origin; /* The namespaces hash table */ - xmlHashTablePtr nsHash; + xmlHashTable *nsHash; /* variable lookup func */ xmlXPathVariableLookupFunc varLookupFunc; /* variable lookup data */ @@ -324,7 +324,7 @@ struct _xmlXPathContext { void *funcLookupData; /* Array of temp namespaces */ - xmlNsPtr *tmpNsList; + xmlNs **tmpNsList; /* number of namespaces in scope */ int tmpNsNr; @@ -335,10 +335,10 @@ struct _xmlXPathContext { /* the last error */ xmlError lastError; /* the source node XSLT */ - xmlNodePtr debugNode; + xmlNode *debugNode; /* dictionary if any */ - xmlDictPtr dict; + xmlDict *dict; /** flags to control compilation */ int flags; @@ -373,22 +373,22 @@ struct _xmlXPathParserContext { int error; /** the evaluation context */ - xmlXPathContextPtr context; + xmlXPathContext *context; /** the current value */ - xmlXPathObjectPtr value; + xmlXPathObject *value; /* number of values stacked */ int valueNr; /* max number of values stacked */ int valueMax; /* stack of values */ - xmlXPathObjectPtr *valueTab; + xmlXPathObject **valueTab; /* the precompiled expression */ - xmlXPathCompExprPtr comp; + xmlXPathCompExpr *comp; /* it this an XPointer expression */ int xptr; /* used for walking preceding axis */ - xmlNodePtr ancestor; + xmlNode *ancestor; /* always zero for compatibility */ int valueFrame; @@ -426,7 +426,7 @@ XMLPUBVAR double xmlXPathNINF; * * @param ns a node-set * @param index index of a node in the set - * @returns the xmlNodePtr at the given `index` in `ns` or NULL if + * @returns the xmlNode at the given `index` in `ns` or NULL if * `index` is out of range (0 to length-1) */ #define xmlXPathNodeSetItem(ns, index) \ @@ -446,18 +446,18 @@ XMLPUBVAR double xmlXPathNINF; /** @endcond */ XMLPUBFUN void - xmlXPathFreeObject (xmlXPathObjectPtr obj); -XMLPUBFUN xmlNodeSetPtr - xmlXPathNodeSetCreate (xmlNodePtr val); + xmlXPathFreeObject (xmlXPathObject *obj); +XMLPUBFUN xmlNodeSet * + xmlXPathNodeSetCreate (xmlNode *val); XMLPUBFUN void - xmlXPathFreeNodeSetList (xmlXPathObjectPtr obj); + xmlXPathFreeNodeSetList (xmlXPathObject *obj); XMLPUBFUN void - xmlXPathFreeNodeSet (xmlNodeSetPtr obj); -XMLPUBFUN xmlXPathObjectPtr - xmlXPathObjectCopy (xmlXPathObjectPtr val); + xmlXPathFreeNodeSet (xmlNodeSet *obj); +XMLPUBFUN xmlXPathObject * + xmlXPathObjectCopy (xmlXPathObject *val); XMLPUBFUN int - xmlXPathCmpNodes (xmlNodePtr node1, - xmlNodePtr node2); + xmlXPathCmpNodes (xmlNode *node1, + xmlNode *node2); /** * Conversion functions to basic types. */ @@ -466,52 +466,52 @@ XMLPUBFUN int XMLPUBFUN int xmlXPathCastStringToBoolean (const xmlChar * val); XMLPUBFUN int - xmlXPathCastNodeSetToBoolean(xmlNodeSetPtr ns); + xmlXPathCastNodeSetToBoolean(xmlNodeSet *ns); XMLPUBFUN int - xmlXPathCastToBoolean (xmlXPathObjectPtr val); + xmlXPathCastToBoolean (xmlXPathObject *val); XMLPUBFUN double xmlXPathCastBooleanToNumber (int val); XMLPUBFUN double xmlXPathCastStringToNumber (const xmlChar * val); XMLPUBFUN double - xmlXPathCastNodeToNumber (xmlNodePtr node); + xmlXPathCastNodeToNumber (xmlNode *node); XMLPUBFUN double - xmlXPathCastNodeSetToNumber (xmlNodeSetPtr ns); + xmlXPathCastNodeSetToNumber (xmlNodeSet *ns); XMLPUBFUN double - xmlXPathCastToNumber (xmlXPathObjectPtr val); + xmlXPathCastToNumber (xmlXPathObject *val); XMLPUBFUN xmlChar * xmlXPathCastBooleanToString (int val); XMLPUBFUN xmlChar * xmlXPathCastNumberToString (double val); XMLPUBFUN xmlChar * - xmlXPathCastNodeToString (xmlNodePtr node); + xmlXPathCastNodeToString (xmlNode *node); XMLPUBFUN xmlChar * - xmlXPathCastNodeSetToString (xmlNodeSetPtr ns); + xmlXPathCastNodeSetToString (xmlNodeSet *ns); XMLPUBFUN xmlChar * - xmlXPathCastToString (xmlXPathObjectPtr val); + xmlXPathCastToString (xmlXPathObject *val); -XMLPUBFUN xmlXPathObjectPtr - xmlXPathConvertBoolean (xmlXPathObjectPtr val); -XMLPUBFUN xmlXPathObjectPtr - xmlXPathConvertNumber (xmlXPathObjectPtr val); -XMLPUBFUN xmlXPathObjectPtr - xmlXPathConvertString (xmlXPathObjectPtr val); +XMLPUBFUN xmlXPathObject * + xmlXPathConvertBoolean (xmlXPathObject *val); +XMLPUBFUN xmlXPathObject * + xmlXPathConvertNumber (xmlXPathObject *val); +XMLPUBFUN xmlXPathObject * + xmlXPathConvertString (xmlXPathObject *val); /** * Context handling. */ -XMLPUBFUN xmlXPathContextPtr - xmlXPathNewContext (xmlDocPtr doc); +XMLPUBFUN xmlXPathContext * + xmlXPathNewContext (xmlDoc *doc); XMLPUBFUN void - xmlXPathFreeContext (xmlXPathContextPtr ctxt); + xmlXPathFreeContext (xmlXPathContext *ctxt); XMLPUBFUN void - xmlXPathSetErrorHandler(xmlXPathContextPtr ctxt, + xmlXPathSetErrorHandler(xmlXPathContext *ctxt, xmlStructuredErrorFunc handler, void *context); XMLPUBFUN int - xmlXPathContextSetCache(xmlXPathContextPtr ctxt, + xmlXPathContextSetCache(xmlXPathContext *ctxt, int active, int value, int options); @@ -519,39 +519,39 @@ XMLPUBFUN int * Evaluation functions. */ XMLPUBFUN long - xmlXPathOrderDocElems (xmlDocPtr doc); + xmlXPathOrderDocElems (xmlDoc *doc); XMLPUBFUN int - xmlXPathSetContextNode (xmlNodePtr node, - xmlXPathContextPtr ctx); -XMLPUBFUN xmlXPathObjectPtr - xmlXPathNodeEval (xmlNodePtr node, + xmlXPathSetContextNode (xmlNode *node, + xmlXPathContext *ctx); +XMLPUBFUN xmlXPathObject * + xmlXPathNodeEval (xmlNode *node, const xmlChar *str, - xmlXPathContextPtr ctx); -XMLPUBFUN xmlXPathObjectPtr + xmlXPathContext *ctx); +XMLPUBFUN xmlXPathObject * xmlXPathEval (const xmlChar *str, - xmlXPathContextPtr ctx); -XMLPUBFUN xmlXPathObjectPtr + xmlXPathContext *ctx); +XMLPUBFUN xmlXPathObject * xmlXPathEvalExpression (const xmlChar *str, - xmlXPathContextPtr ctxt); + xmlXPathContext *ctxt); XMLPUBFUN int - xmlXPathEvalPredicate (xmlXPathContextPtr ctxt, - xmlXPathObjectPtr res); + xmlXPathEvalPredicate (xmlXPathContext *ctxt, + xmlXPathObject *res); /** * Separate compilation/evaluation entry points. */ -XMLPUBFUN xmlXPathCompExprPtr +XMLPUBFUN xmlXPathCompExpr * xmlXPathCompile (const xmlChar *str); -XMLPUBFUN xmlXPathCompExprPtr - xmlXPathCtxtCompile (xmlXPathContextPtr ctxt, +XMLPUBFUN xmlXPathCompExpr * + xmlXPathCtxtCompile (xmlXPathContext *ctxt, const xmlChar *str); -XMLPUBFUN xmlXPathObjectPtr - xmlXPathCompiledEval (xmlXPathCompExprPtr comp, - xmlXPathContextPtr ctx); +XMLPUBFUN xmlXPathObject * + xmlXPathCompiledEval (xmlXPathCompExpr *comp, + xmlXPathContext *ctx); XMLPUBFUN int - xmlXPathCompiledEvalToBoolean(xmlXPathCompExprPtr comp, - xmlXPathContextPtr ctxt); + xmlXPathCompiledEvalToBoolean(xmlXPathCompExpr *comp, + xmlXPathContext *ctxt); XMLPUBFUN void - xmlXPathFreeCompExpr (xmlXPathCompExprPtr comp); + xmlXPathFreeCompExpr (xmlXPathCompExpr *comp); XML_DEPRECATED XMLPUBFUN void diff --git a/include/libxml/xpathInternals.h b/include/libxml/xpathInternals.h index f1d198c3..1b66a166 100644 --- a/include/libxml/xpathInternals.h +++ b/include/libxml/xpathInternals.h @@ -107,15 +107,15 @@ extern "C" { #define xmlXPathGetContextNode(ctxt) ((ctxt)->context->node) XMLPUBFUN int - xmlXPathPopBoolean (xmlXPathParserContextPtr ctxt); + xmlXPathPopBoolean (xmlXPathParserContext *ctxt); XMLPUBFUN double - xmlXPathPopNumber (xmlXPathParserContextPtr ctxt); + xmlXPathPopNumber (xmlXPathParserContext *ctxt); XMLPUBFUN xmlChar * - xmlXPathPopString (xmlXPathParserContextPtr ctxt); -XMLPUBFUN xmlNodeSetPtr - xmlXPathPopNodeSet (xmlXPathParserContextPtr ctxt); + xmlXPathPopString (xmlXPathParserContext *ctxt); +XMLPUBFUN xmlNodeSet * + xmlXPathPopNodeSet (xmlXPathParserContext *ctxt); XMLPUBFUN void * - xmlXPathPopExternal (xmlXPathParserContextPtr ctxt); + xmlXPathPopExternal (xmlXPathParserContext *ctxt); /** * Pushes the boolean `val` on the context stack. @@ -309,7 +309,7 @@ XMLPUBFUN void * */ XMLPUBFUN void - xmlXPathRegisterVariableLookup (xmlXPathContextPtr ctxt, + xmlXPathRegisterVariableLookup (xmlXPathContext *ctxt, xmlXPathVariableLookupFunc f, void *data); @@ -318,7 +318,7 @@ XMLPUBFUN void */ XMLPUBFUN void - xmlXPathRegisterFuncLookup (xmlXPathContextPtr ctxt, + xmlXPathRegisterFuncLookup (xmlXPathContext *ctxt, xmlXPathFuncLookupFunc f, void *funcCtxt); @@ -326,72 +326,72 @@ XMLPUBFUN void * Error reporting. */ XMLPUBFUN void - xmlXPatherror (xmlXPathParserContextPtr ctxt, + xmlXPatherror (xmlXPathParserContext *ctxt, const char *file, int line, int no); XMLPUBFUN void - xmlXPathErr (xmlXPathParserContextPtr ctxt, + xmlXPathErr (xmlXPathParserContext *ctxt, int error); #ifdef LIBXML_DEBUG_ENABLED XMLPUBFUN void xmlXPathDebugDumpObject (FILE *output, - xmlXPathObjectPtr cur, + xmlXPathObject *cur, int depth); XMLPUBFUN void xmlXPathDebugDumpCompExpr(FILE *output, - xmlXPathCompExprPtr comp, + xmlXPathCompExpr *comp, int depth); #endif /** * NodeSet handling. */ XMLPUBFUN int - xmlXPathNodeSetContains (xmlNodeSetPtr cur, - xmlNodePtr val); -XMLPUBFUN xmlNodeSetPtr - xmlXPathDifference (xmlNodeSetPtr nodes1, - xmlNodeSetPtr nodes2); -XMLPUBFUN xmlNodeSetPtr - xmlXPathIntersection (xmlNodeSetPtr nodes1, - xmlNodeSetPtr nodes2); + xmlXPathNodeSetContains (xmlNodeSet *cur, + xmlNode *val); +XMLPUBFUN xmlNodeSet * + xmlXPathDifference (xmlNodeSet *nodes1, + xmlNodeSet *nodes2); +XMLPUBFUN xmlNodeSet * + xmlXPathIntersection (xmlNodeSet *nodes1, + xmlNodeSet *nodes2); -XMLPUBFUN xmlNodeSetPtr - xmlXPathDistinctSorted (xmlNodeSetPtr nodes); -XMLPUBFUN xmlNodeSetPtr - xmlXPathDistinct (xmlNodeSetPtr nodes); +XMLPUBFUN xmlNodeSet * + xmlXPathDistinctSorted (xmlNodeSet *nodes); +XMLPUBFUN xmlNodeSet * + xmlXPathDistinct (xmlNodeSet *nodes); XMLPUBFUN int - xmlXPathHasSameNodes (xmlNodeSetPtr nodes1, - xmlNodeSetPtr nodes2); + xmlXPathHasSameNodes (xmlNodeSet *nodes1, + xmlNodeSet *nodes2); -XMLPUBFUN xmlNodeSetPtr - xmlXPathNodeLeadingSorted (xmlNodeSetPtr nodes, - xmlNodePtr node); -XMLPUBFUN xmlNodeSetPtr - xmlXPathLeadingSorted (xmlNodeSetPtr nodes1, - xmlNodeSetPtr nodes2); -XMLPUBFUN xmlNodeSetPtr - xmlXPathNodeLeading (xmlNodeSetPtr nodes, - xmlNodePtr node); -XMLPUBFUN xmlNodeSetPtr - xmlXPathLeading (xmlNodeSetPtr nodes1, - xmlNodeSetPtr nodes2); +XMLPUBFUN xmlNodeSet * + xmlXPathNodeLeadingSorted (xmlNodeSet *nodes, + xmlNode *node); +XMLPUBFUN xmlNodeSet * + xmlXPathLeadingSorted (xmlNodeSet *nodes1, + xmlNodeSet *nodes2); +XMLPUBFUN xmlNodeSet * + xmlXPathNodeLeading (xmlNodeSet *nodes, + xmlNode *node); +XMLPUBFUN xmlNodeSet * + xmlXPathLeading (xmlNodeSet *nodes1, + xmlNodeSet *nodes2); -XMLPUBFUN xmlNodeSetPtr - xmlXPathNodeTrailingSorted (xmlNodeSetPtr nodes, - xmlNodePtr node); -XMLPUBFUN xmlNodeSetPtr - xmlXPathTrailingSorted (xmlNodeSetPtr nodes1, - xmlNodeSetPtr nodes2); -XMLPUBFUN xmlNodeSetPtr - xmlXPathNodeTrailing (xmlNodeSetPtr nodes, - xmlNodePtr node); -XMLPUBFUN xmlNodeSetPtr - xmlXPathTrailing (xmlNodeSetPtr nodes1, - xmlNodeSetPtr nodes2); +XMLPUBFUN xmlNodeSet * + xmlXPathNodeTrailingSorted (xmlNodeSet *nodes, + xmlNode *node); +XMLPUBFUN xmlNodeSet * + xmlXPathTrailingSorted (xmlNodeSet *nodes1, + xmlNodeSet *nodes2); +XMLPUBFUN xmlNodeSet * + xmlXPathNodeTrailing (xmlNodeSet *nodes, + xmlNode *node); +XMLPUBFUN xmlNodeSet * + xmlXPathTrailing (xmlNodeSet *nodes1, + xmlNodeSet *nodes2); /** @@ -399,105 +399,105 @@ XMLPUBFUN xmlNodeSetPtr */ XMLPUBFUN int - xmlXPathRegisterNs (xmlXPathContextPtr ctxt, + xmlXPathRegisterNs (xmlXPathContext *ctxt, const xmlChar *prefix, const xmlChar *ns_uri); XMLPUBFUN const xmlChar * - xmlXPathNsLookup (xmlXPathContextPtr ctxt, + xmlXPathNsLookup (xmlXPathContext *ctxt, const xmlChar *prefix); XMLPUBFUN void - xmlXPathRegisteredNsCleanup (xmlXPathContextPtr ctxt); + xmlXPathRegisteredNsCleanup (xmlXPathContext *ctxt); XMLPUBFUN int - xmlXPathRegisterFunc (xmlXPathContextPtr ctxt, + xmlXPathRegisterFunc (xmlXPathContext *ctxt, const xmlChar *name, xmlXPathFunction f); XMLPUBFUN int - xmlXPathRegisterFuncNS (xmlXPathContextPtr ctxt, + xmlXPathRegisterFuncNS (xmlXPathContext *ctxt, const xmlChar *name, const xmlChar *ns_uri, xmlXPathFunction f); XMLPUBFUN int - xmlXPathRegisterVariable (xmlXPathContextPtr ctxt, + xmlXPathRegisterVariable (xmlXPathContext *ctxt, const xmlChar *name, - xmlXPathObjectPtr value); + xmlXPathObject *value); XMLPUBFUN int - xmlXPathRegisterVariableNS (xmlXPathContextPtr ctxt, + xmlXPathRegisterVariableNS (xmlXPathContext *ctxt, const xmlChar *name, const xmlChar *ns_uri, - xmlXPathObjectPtr value); + xmlXPathObject *value); XMLPUBFUN xmlXPathFunction - xmlXPathFunctionLookup (xmlXPathContextPtr ctxt, + xmlXPathFunctionLookup (xmlXPathContext *ctxt, const xmlChar *name); XMLPUBFUN xmlXPathFunction - xmlXPathFunctionLookupNS (xmlXPathContextPtr ctxt, + xmlXPathFunctionLookupNS (xmlXPathContext *ctxt, const xmlChar *name, const xmlChar *ns_uri); XMLPUBFUN void - xmlXPathRegisteredFuncsCleanup (xmlXPathContextPtr ctxt); -XMLPUBFUN xmlXPathObjectPtr - xmlXPathVariableLookup (xmlXPathContextPtr ctxt, + xmlXPathRegisteredFuncsCleanup (xmlXPathContext *ctxt); +XMLPUBFUN xmlXPathObject * + xmlXPathVariableLookup (xmlXPathContext *ctxt, const xmlChar *name); -XMLPUBFUN xmlXPathObjectPtr - xmlXPathVariableLookupNS (xmlXPathContextPtr ctxt, +XMLPUBFUN xmlXPathObject * + xmlXPathVariableLookupNS (xmlXPathContext *ctxt, const xmlChar *name, const xmlChar *ns_uri); XMLPUBFUN void - xmlXPathRegisteredVariablesCleanup(xmlXPathContextPtr ctxt); + xmlXPathRegisteredVariablesCleanup(xmlXPathContext *ctxt); /** * Utilities to extend XPath. */ -XMLPUBFUN xmlXPathParserContextPtr +XMLPUBFUN xmlXPathParserContext * xmlXPathNewParserContext (const xmlChar *str, - xmlXPathContextPtr ctxt); + xmlXPathContext *ctxt); XMLPUBFUN void - xmlXPathFreeParserContext (xmlXPathParserContextPtr ctxt); + xmlXPathFreeParserContext (xmlXPathParserContext *ctxt); -XMLPUBFUN xmlXPathObjectPtr - xmlXPathValuePop (xmlXPathParserContextPtr ctxt); +XMLPUBFUN xmlXPathObject * + xmlXPathValuePop (xmlXPathParserContext *ctxt); XMLPUBFUN int - xmlXPathValuePush (xmlXPathParserContextPtr ctxt, - xmlXPathObjectPtr value); + xmlXPathValuePush (xmlXPathParserContext *ctxt, + xmlXPathObject *value); -XMLPUBFUN xmlXPathObjectPtr +XMLPUBFUN xmlXPathObject * xmlXPathNewString (const xmlChar *val); -XMLPUBFUN xmlXPathObjectPtr +XMLPUBFUN xmlXPathObject * xmlXPathNewCString (const char *val); -XMLPUBFUN xmlXPathObjectPtr +XMLPUBFUN xmlXPathObject * xmlXPathWrapString (xmlChar *val); -XMLPUBFUN xmlXPathObjectPtr +XMLPUBFUN xmlXPathObject * xmlXPathWrapCString (char * val); -XMLPUBFUN xmlXPathObjectPtr +XMLPUBFUN xmlXPathObject * xmlXPathNewFloat (double val); -XMLPUBFUN xmlXPathObjectPtr +XMLPUBFUN xmlXPathObject * xmlXPathNewBoolean (int val); -XMLPUBFUN xmlXPathObjectPtr - xmlXPathNewNodeSet (xmlNodePtr val); -XMLPUBFUN xmlXPathObjectPtr - xmlXPathNewValueTree (xmlNodePtr val); +XMLPUBFUN xmlXPathObject * + xmlXPathNewNodeSet (xmlNode *val); +XMLPUBFUN xmlXPathObject * + xmlXPathNewValueTree (xmlNode *val); XMLPUBFUN int - xmlXPathNodeSetAdd (xmlNodeSetPtr cur, - xmlNodePtr val); + xmlXPathNodeSetAdd (xmlNodeSet *cur, + xmlNode *val); XMLPUBFUN int - xmlXPathNodeSetAddUnique (xmlNodeSetPtr cur, - xmlNodePtr val); + xmlXPathNodeSetAddUnique (xmlNodeSet *cur, + xmlNode *val); XMLPUBFUN int - xmlXPathNodeSetAddNs (xmlNodeSetPtr cur, - xmlNodePtr node, - xmlNsPtr ns); + xmlXPathNodeSetAddNs (xmlNodeSet *cur, + xmlNode *node, + xmlNs *ns); XMLPUBFUN void - xmlXPathNodeSetSort (xmlNodeSetPtr set); + xmlXPathNodeSetSort (xmlNodeSet *set); XMLPUBFUN void - xmlXPathRoot (xmlXPathParserContextPtr ctxt); + xmlXPathRoot (xmlXPathParserContext *ctxt); XML_DEPRECATED XMLPUBFUN void - xmlXPathEvalExpr (xmlXPathParserContextPtr ctxt); + xmlXPathEvalExpr (xmlXPathParserContext *ctxt); XMLPUBFUN xmlChar * - xmlXPathParseName (xmlXPathParserContextPtr ctxt); + xmlXPathParseName (xmlXPathParserContext *ctxt); XMLPUBFUN xmlChar * - xmlXPathParseNCName (xmlXPathParserContextPtr ctxt); + xmlXPathParseNCName (xmlXPathParserContext *ctxt); /* * Existing functions. @@ -505,101 +505,101 @@ XMLPUBFUN xmlChar * XMLPUBFUN double xmlXPathStringEvalNumber (const xmlChar *str); XMLPUBFUN int - xmlXPathEvaluatePredicateResult (xmlXPathParserContextPtr ctxt, - xmlXPathObjectPtr res); + xmlXPathEvaluatePredicateResult (xmlXPathParserContext *ctxt, + xmlXPathObject *res); XMLPUBFUN void - xmlXPathRegisterAllFunctions (xmlXPathContextPtr ctxt); -XMLPUBFUN xmlNodeSetPtr - xmlXPathNodeSetMerge (xmlNodeSetPtr val1, - xmlNodeSetPtr val2); + xmlXPathRegisterAllFunctions (xmlXPathContext *ctxt); +XMLPUBFUN xmlNodeSet * + xmlXPathNodeSetMerge (xmlNodeSet *val1, + xmlNodeSet *val2); XMLPUBFUN void - xmlXPathNodeSetDel (xmlNodeSetPtr cur, - xmlNodePtr val); + xmlXPathNodeSetDel (xmlNodeSet *cur, + xmlNode *val); XMLPUBFUN void - xmlXPathNodeSetRemove (xmlNodeSetPtr cur, + xmlXPathNodeSetRemove (xmlNodeSet *cur, int val); -XMLPUBFUN xmlXPathObjectPtr - xmlXPathNewNodeSetList (xmlNodeSetPtr val); -XMLPUBFUN xmlXPathObjectPtr - xmlXPathWrapNodeSet (xmlNodeSetPtr val); -XMLPUBFUN xmlXPathObjectPtr +XMLPUBFUN xmlXPathObject * + xmlXPathNewNodeSetList (xmlNodeSet *val); +XMLPUBFUN xmlXPathObject * + xmlXPathWrapNodeSet (xmlNodeSet *val); +XMLPUBFUN xmlXPathObject * xmlXPathWrapExternal (void *val); -XMLPUBFUN int xmlXPathEqualValues(xmlXPathParserContextPtr ctxt); -XMLPUBFUN int xmlXPathNotEqualValues(xmlXPathParserContextPtr ctxt); -XMLPUBFUN int xmlXPathCompareValues(xmlXPathParserContextPtr ctxt, int inf, int strict); -XMLPUBFUN void xmlXPathValueFlipSign(xmlXPathParserContextPtr ctxt); -XMLPUBFUN void xmlXPathAddValues(xmlXPathParserContextPtr ctxt); -XMLPUBFUN void xmlXPathSubValues(xmlXPathParserContextPtr ctxt); -XMLPUBFUN void xmlXPathMultValues(xmlXPathParserContextPtr ctxt); -XMLPUBFUN void xmlXPathDivValues(xmlXPathParserContextPtr ctxt); -XMLPUBFUN void xmlXPathModValues(xmlXPathParserContextPtr ctxt); +XMLPUBFUN int xmlXPathEqualValues(xmlXPathParserContext *ctxt); +XMLPUBFUN int xmlXPathNotEqualValues(xmlXPathParserContext *ctxt); +XMLPUBFUN int xmlXPathCompareValues(xmlXPathParserContext *ctxt, int inf, int strict); +XMLPUBFUN void xmlXPathValueFlipSign(xmlXPathParserContext *ctxt); +XMLPUBFUN void xmlXPathAddValues(xmlXPathParserContext *ctxt); +XMLPUBFUN void xmlXPathSubValues(xmlXPathParserContext *ctxt); +XMLPUBFUN void xmlXPathMultValues(xmlXPathParserContext *ctxt); +XMLPUBFUN void xmlXPathDivValues(xmlXPathParserContext *ctxt); +XMLPUBFUN void xmlXPathModValues(xmlXPathParserContext *ctxt); XMLPUBFUN int xmlXPathIsNodeType(const xmlChar *name); /* * Some of the axis navigation routines. */ -XMLPUBFUN xmlNodePtr xmlXPathNextSelf(xmlXPathParserContextPtr ctxt, - xmlNodePtr cur); -XMLPUBFUN xmlNodePtr xmlXPathNextChild(xmlXPathParserContextPtr ctxt, - xmlNodePtr cur); -XMLPUBFUN xmlNodePtr xmlXPathNextDescendant(xmlXPathParserContextPtr ctxt, - xmlNodePtr cur); -XMLPUBFUN xmlNodePtr xmlXPathNextDescendantOrSelf(xmlXPathParserContextPtr ctxt, - xmlNodePtr cur); -XMLPUBFUN xmlNodePtr xmlXPathNextParent(xmlXPathParserContextPtr ctxt, - xmlNodePtr cur); -XMLPUBFUN xmlNodePtr xmlXPathNextAncestorOrSelf(xmlXPathParserContextPtr ctxt, - xmlNodePtr cur); -XMLPUBFUN xmlNodePtr xmlXPathNextFollowingSibling(xmlXPathParserContextPtr ctxt, - xmlNodePtr cur); -XMLPUBFUN xmlNodePtr xmlXPathNextFollowing(xmlXPathParserContextPtr ctxt, - xmlNodePtr cur); -XMLPUBFUN xmlNodePtr xmlXPathNextNamespace(xmlXPathParserContextPtr ctxt, - xmlNodePtr cur); -XMLPUBFUN xmlNodePtr xmlXPathNextAttribute(xmlXPathParserContextPtr ctxt, - xmlNodePtr cur); -XMLPUBFUN xmlNodePtr xmlXPathNextPreceding(xmlXPathParserContextPtr ctxt, - xmlNodePtr cur); -XMLPUBFUN xmlNodePtr xmlXPathNextAncestor(xmlXPathParserContextPtr ctxt, - xmlNodePtr cur); -XMLPUBFUN xmlNodePtr xmlXPathNextPrecedingSibling(xmlXPathParserContextPtr ctxt, - xmlNodePtr cur); +XMLPUBFUN xmlNode *xmlXPathNextSelf(xmlXPathParserContext *ctxt, + xmlNode *cur); +XMLPUBFUN xmlNode *xmlXPathNextChild(xmlXPathParserContext *ctxt, + xmlNode *cur); +XMLPUBFUN xmlNode *xmlXPathNextDescendant(xmlXPathParserContext *ctxt, + xmlNode *cur); +XMLPUBFUN xmlNode *xmlXPathNextDescendantOrSelf(xmlXPathParserContext *ctxt, + xmlNode *cur); +XMLPUBFUN xmlNode *xmlXPathNextParent(xmlXPathParserContext *ctxt, + xmlNode *cur); +XMLPUBFUN xmlNode *xmlXPathNextAncestorOrSelf(xmlXPathParserContext *ctxt, + xmlNode *cur); +XMLPUBFUN xmlNode *xmlXPathNextFollowingSibling(xmlXPathParserContext *ctxt, + xmlNode *cur); +XMLPUBFUN xmlNode *xmlXPathNextFollowing(xmlXPathParserContext *ctxt, + xmlNode *cur); +XMLPUBFUN xmlNode *xmlXPathNextNamespace(xmlXPathParserContext *ctxt, + xmlNode *cur); +XMLPUBFUN xmlNode *xmlXPathNextAttribute(xmlXPathParserContext *ctxt, + xmlNode *cur); +XMLPUBFUN xmlNode *xmlXPathNextPreceding(xmlXPathParserContext *ctxt, + xmlNode *cur); +XMLPUBFUN xmlNode *xmlXPathNextAncestor(xmlXPathParserContext *ctxt, + xmlNode *cur); +XMLPUBFUN xmlNode *xmlXPathNextPrecedingSibling(xmlXPathParserContext *ctxt, + xmlNode *cur); /* * The official core of XPath functions. */ -XMLPUBFUN void xmlXPathLastFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathPositionFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathCountFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathIdFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathLocalNameFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathNamespaceURIFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathStringFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathStringLengthFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathConcatFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathContainsFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathStartsWithFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathSubstringFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathSubstringBeforeFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathSubstringAfterFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathNormalizeFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathNotFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathTrueFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathFalseFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathLangFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathNumberFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathSumFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathFloorFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathCeilingFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathRoundFunction(xmlXPathParserContextPtr ctxt, int nargs); -XMLPUBFUN void xmlXPathBooleanFunction(xmlXPathParserContextPtr ctxt, int nargs); +XMLPUBFUN void xmlXPathLastFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathPositionFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathCountFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathIdFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathLocalNameFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathNamespaceURIFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathStringFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathStringLengthFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathConcatFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathContainsFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathStartsWithFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathSubstringFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathSubstringBeforeFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathSubstringAfterFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathNormalizeFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathTranslateFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathNotFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathTrueFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathFalseFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathLangFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathNumberFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathSumFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathFloorFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathCeilingFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathRoundFunction(xmlXPathParserContext *ctxt, int nargs); +XMLPUBFUN void xmlXPathBooleanFunction(xmlXPathParserContext *ctxt, int nargs); /** * Really internal functions */ -XMLPUBFUN void xmlXPathNodeSetFreeNs(xmlNsPtr ns); +XMLPUBFUN void xmlXPathNodeSetFreeNs(xmlNs *ns); #ifdef __cplusplus } diff --git a/include/libxml/xpointer.h b/include/libxml/xpointer.h index ebad18b7..64398516 100644 --- a/include/libxml/xpointer.h +++ b/include/libxml/xpointer.h @@ -35,13 +35,13 @@ extern "C" { * Functions. */ XML_DEPRECATED -XMLPUBFUN xmlXPathContextPtr - xmlXPtrNewContext (xmlDocPtr doc, - xmlNodePtr here, - xmlNodePtr origin); -XMLPUBFUN xmlXPathObjectPtr +XMLPUBFUN xmlXPathContext * + xmlXPtrNewContext (xmlDoc *doc, + xmlNode *here, + xmlNode *origin); +XMLPUBFUN xmlXPathObject * xmlXPtrEval (const xmlChar *str, - xmlXPathContextPtr ctx); + xmlXPathContext *ctx); #ifdef __cplusplus } diff --git a/include/private/buf.h b/include/private/buf.h index a8a568b1..dde361e5 100644 --- a/include/private/buf.h +++ b/include/private/buf.h @@ -4,42 +4,42 @@ #include #include -XML_HIDDEN xmlBufPtr +XML_HIDDEN xmlBuf * xmlBufCreate(size_t size); -XML_HIDDEN xmlBufPtr +XML_HIDDEN xmlBuf * xmlBufCreateMem(const xmlChar *mem, size_t size, int isStatic); XML_HIDDEN void -xmlBufFree(xmlBufPtr buf); +xmlBufFree(xmlBuf *buf); XML_HIDDEN void -xmlBufEmpty(xmlBufPtr buf); +xmlBufEmpty(xmlBuf *buf); XML_HIDDEN int -xmlBufGrow(xmlBufPtr buf, size_t len); +xmlBufGrow(xmlBuf *buf, size_t len); XML_HIDDEN int -xmlBufAdd(xmlBufPtr buf, const xmlChar *str, size_t len); +xmlBufAdd(xmlBuf *buf, const xmlChar *str, size_t len); XML_HIDDEN int -xmlBufCat(xmlBufPtr buf, const xmlChar *str); +xmlBufCat(xmlBuf *buf, const xmlChar *str); XML_HIDDEN size_t -xmlBufAvail(const xmlBufPtr buf); +xmlBufAvail(xmlBuf *buf); XML_HIDDEN int -xmlBufIsEmpty(const xmlBufPtr buf); +xmlBufIsEmpty(xmlBuf *buf); XML_HIDDEN int -xmlBufAddLen(xmlBufPtr buf, size_t len); +xmlBufAddLen(xmlBuf *buf, size_t len); XML_HIDDEN xmlChar * -xmlBufDetach(xmlBufPtr buf); +xmlBufDetach(xmlBuf *buf); -XML_HIDDEN xmlBufPtr -xmlBufFromBuffer(xmlBufferPtr buffer); +XML_HIDDEN xmlBuf * +xmlBufFromBuffer(xmlBuffer *buffer); XML_HIDDEN int -xmlBufBackToBuffer(xmlBufPtr buf, xmlBufferPtr ret); +xmlBufBackToBuffer(xmlBuf *buf, xmlBuffer *ret); XML_HIDDEN int -xmlBufResetInput(xmlBufPtr buf, xmlParserInputPtr input); +xmlBufResetInput(xmlBuf *buf, xmlParserInput *input); XML_HIDDEN int -xmlBufUpdateInput(xmlBufPtr buf, xmlParserInputPtr input, size_t pos); +xmlBufUpdateInput(xmlBuf *buf, xmlParserInput *input, size_t pos); #endif /* XML_BUF_H_PRIVATE__ */ diff --git a/include/private/dict.h b/include/private/dict.h index 826ac54a..4f2edb85 100644 --- a/include/private/dict.h +++ b/include/private/dict.h @@ -60,7 +60,7 @@ xmlDictComputeHash(const xmlDict *dict, const xmlChar *string); XML_HIDDEN unsigned xmlDictCombineHash(unsigned v1, unsigned v2); XML_HIDDEN xmlHashedString -xmlDictLookupHashed(xmlDictPtr dict, const xmlChar *name, int len); +xmlDictLookupHashed(xmlDict *dict, const xmlChar *name, int len); XML_HIDDEN void xmlInitRandom(void); diff --git a/include/private/enc.h b/include/private/enc.h index ef8ce5ae..3ffa41b9 100644 --- a/include/private/enc.h +++ b/include/private/enc.h @@ -12,8 +12,8 @@ xmlEncInputChunk(xmlCharEncodingHandler *handler, unsigned char *out, int *outlen, const unsigned char *in, int *inlen, int flush); XML_HIDDEN xmlCharEncError -xmlCharEncInput(xmlParserInputBufferPtr input, size_t *sizeOut, int flush); +xmlCharEncInput(xmlParserInputBuffer *input, size_t *sizeOut, int flush); XML_HIDDEN int -xmlCharEncOutput(xmlOutputBufferPtr output, int init); +xmlCharEncOutput(xmlOutputBuffer *output, int init); #endif /* XML_ENC_H_PRIVATE__ */ diff --git a/include/private/html.h b/include/private/html.h index f86c3d75..a62727d5 100644 --- a/include/private/html.h +++ b/include/private/html.h @@ -22,14 +22,14 @@ typedef struct { size_t size; } htmlMetaEncodingOffsets; -XML_HIDDEN xmlNodePtr -htmlCtxtParseContentInternal(xmlParserCtxtPtr ctxt, xmlParserInputPtr input); +XML_HIDDEN xmlNode * +htmlCtxtParseContentInternal(xmlParserCtxt *ctxt, xmlParserInput *input); XML_HIDDEN int htmlParseContentType(const xmlChar *val, htmlMetaEncodingOffsets *off); XML_HIDDEN void -htmlNodeDumpInternal(xmlOutputBufferPtr buf, xmlNodePtr cur, +htmlNodeDumpInternal(xmlOutputBuffer *buf, xmlNode *cur, const char *encoding, int format); #endif /* LIBXML_HTML_ENABLED */ diff --git a/include/private/io.h b/include/private/io.h index 9f2b12ac..d56d3d32 100644 --- a/include/private/io.h +++ b/include/private/io.h @@ -28,7 +28,7 @@ XML_HIDDEN xmlChar * xmlEscapeText(const xmlChar *text, int flags); #ifdef LIBXML_OUTPUT_ENABLED XML_HIDDEN void -xmlSerializeText(xmlOutputBufferPtr buf, const xmlChar *string, size_t maxSize, +xmlSerializeText(xmlOutputBuffer *buf, const xmlChar *string, size_t maxSize, unsigned flags); #endif @@ -41,20 +41,20 @@ xmlNoNetExists(const char *filename); XML_HIDDEN xmlParserErrors xmlParserInputBufferCreateUrl(const char *URI, xmlCharEncoding enc, xmlParserInputFlags flags, - xmlParserInputBufferPtr *out); + xmlParserInputBuffer **out); -XML_HIDDEN xmlParserInputBufferPtr +XML_HIDDEN xmlParserInputBuffer * xmlNewInputBufferString(const char *str, xmlParserInputFlags flags); -XML_HIDDEN xmlParserInputBufferPtr +XML_HIDDEN xmlParserInputBuffer * xmlNewInputBufferMemory(const void *mem, size_t size, xmlParserInputFlags flags, xmlCharEncoding enc); XML_HIDDEN xmlParserErrors -xmlInputFromFd(xmlParserInputBufferPtr buf, int fd, xmlParserInputFlags flags); +xmlInputFromFd(xmlParserInputBuffer *buf, int fd, xmlParserInputFlags flags); #ifdef LIBXML_OUTPUT_ENABLED XML_HIDDEN void -xmlOutputBufferWriteQuotedString(xmlOutputBufferPtr buf, +xmlOutputBufferWriteQuotedString(xmlOutputBuffer *buf, const xmlChar *string); #endif diff --git a/include/private/lint.h b/include/private/lint.h index 5c055c3f..83d625c1 100644 --- a/include/private/lint.h +++ b/include/private/lint.h @@ -10,6 +10,6 @@ xmllintMain(int argc, const char **argv, FILE *errStream, xmlResourceLoader loader); void -xmllintShell(xmlDocPtr doc, const char *filename, FILE *output); +xmllintShell(xmlDoc *doc, const char *filename, FILE *output); #endif /* XML_LINT_H_PRIVATE__ */ diff --git a/include/private/parser.h b/include/private/parser.h index 5086c1d5..ed6ab0c3 100644 --- a/include/private/parser.h +++ b/include/private/parser.h @@ -56,43 +56,43 @@ struct _xmlAttrHashBucket { }; XML_HIDDEN void -xmlCtxtVErr(xmlParserCtxtPtr ctxt, xmlNodePtr node, xmlErrorDomain domain, +xmlCtxtVErr(xmlParserCtxt *ctxt, xmlNode *node, xmlErrorDomain domain, xmlParserErrors code, xmlErrorLevel level, const xmlChar *str1, const xmlChar *str2, const xmlChar *str3, int int1, const char *msg, va_list ap); XML_HIDDEN void -xmlCtxtErr(xmlParserCtxtPtr ctxt, xmlNodePtr node, xmlErrorDomain domain, +xmlCtxtErr(xmlParserCtxt *ctxt, xmlNode *node, xmlErrorDomain domain, xmlParserErrors code, xmlErrorLevel level, const xmlChar *str1, const xmlChar *str2, const xmlChar *str3, int int1, const char *msg, ...); XML_HIDDEN void -xmlFatalErr(xmlParserCtxtPtr ctxt, xmlParserErrors error, const char *info); +xmlFatalErr(xmlParserCtxt *ctxt, xmlParserErrors error, const char *info); XML_HIDDEN void LIBXML_ATTR_FORMAT(3,0) xmlWarningMsg(xmlParserCtxtPtr ctxt, xmlParserErrors error, const char *msg, const xmlChar *str1, const xmlChar *str2); XML_HIDDEN void -xmlCtxtErrIO(xmlParserCtxtPtr ctxt, int code, const char *uri); +xmlCtxtErrIO(xmlParserCtxt *ctxt, int code, const char *uri); XML_HIDDEN int -xmlCtxtIsCatastrophicError(xmlParserCtxtPtr ctxt); +xmlCtxtIsCatastrophicError(xmlParserCtxt *ctxt); XML_HIDDEN void -xmlHaltParser(xmlParserCtxtPtr ctxt); +xmlHaltParser(xmlParserCtxt *ctxt); XML_HIDDEN int -xmlParserGrow(xmlParserCtxtPtr ctxt); +xmlParserGrow(xmlParserCtxt *ctxt); XML_HIDDEN void -xmlParserShrink(xmlParserCtxtPtr ctxt); +xmlParserShrink(xmlParserCtxt *ctxt); XML_HIDDEN void -xmlDetectEncoding(xmlParserCtxtPtr ctxt); +xmlDetectEncoding(xmlParserCtxt *ctxt); XML_HIDDEN void -xmlSetDeclaredEncoding(xmlParserCtxtPtr ctxt, xmlChar *encoding); +xmlSetDeclaredEncoding(xmlParserCtxt *ctxt, xmlChar *encoding); XML_HIDDEN const xmlChar * -xmlGetActualEncoding(xmlParserCtxtPtr ctxt); +xmlGetActualEncoding(xmlParserCtxt *ctxt); XML_HIDDEN int -nodePush(xmlParserCtxtPtr ctxt, xmlNodePtr value); -XML_HIDDEN xmlNodePtr -nodePop(xmlParserCtxtPtr ctxt); +nodePush(xmlParserCtxt *ctxt, xmlNode *value); +XML_HIDDEN xmlNode * +nodePop(xmlParserCtxt *ctxt); XML_HIDDEN xmlParserNsData * xmlParserNsCreate(void); @@ -103,44 +103,44 @@ xmlParserNsFree(xmlParserNsData *nsdb); * efficiently and should be made public. */ XML_HIDDEN int -xmlParserNsUpdateSax(xmlParserCtxtPtr ctxt, const xmlChar *prefix, +xmlParserNsUpdateSax(xmlParserCtxt *ctxt, const xmlChar *prefix, void *saxData); XML_HIDDEN void * -xmlParserNsLookupSax(xmlParserCtxtPtr ctxt, const xmlChar *prefix); +xmlParserNsLookupSax(xmlParserCtxt *ctxt, const xmlChar *prefix); -XML_HIDDEN xmlParserInputPtr -xmlLoadResource(xmlParserCtxtPtr ctxt, const char *url, const char *publicId, +XML_HIDDEN xmlParserInput * +xmlLoadResource(xmlParserCtxt *ctxt, const char *url, const char *publicId, xmlResourceType type); -XML_HIDDEN xmlParserInputPtr -xmlCtxtNewInputFromUrl(xmlParserCtxtPtr ctxt, const char *url, +XML_HIDDEN xmlParserInput * +xmlCtxtNewInputFromUrl(xmlParserCtxt *ctxt, const char *url, const char *publicId, const char *encoding, xmlParserInputFlags flags); -XML_HIDDEN xmlParserInputPtr -xmlCtxtNewInputFromMemory(xmlParserCtxtPtr ctxt, const char *url, +XML_HIDDEN xmlParserInput * +xmlCtxtNewInputFromMemory(xmlParserCtxt *ctxt, const char *url, const void *mem, size_t size, const char *encoding, xmlParserInputFlags flags); -XML_HIDDEN xmlParserInputPtr -xmlCtxtNewInputFromString(xmlParserCtxtPtr ctxt, const char *url, +XML_HIDDEN xmlParserInput * +xmlCtxtNewInputFromString(xmlParserCtxt *ctxt, const char *url, const char *str, const char *encoding, xmlParserInputFlags flags); -XML_HIDDEN xmlParserInputPtr -xmlCtxtNewInputFromFd(xmlParserCtxtPtr ctxt, const char *filename, int fd, +XML_HIDDEN xmlParserInput * +xmlCtxtNewInputFromFd(xmlParserCtxt *ctxt, const char *filename, int fd, const char *encoding, xmlParserInputFlags flags); -XML_HIDDEN xmlParserInputPtr -xmlCtxtNewInputFromIO(xmlParserCtxtPtr ctxt, const char *url, +XML_HIDDEN xmlParserInput * +xmlCtxtNewInputFromIO(xmlParserCtxt *ctxt, const char *url, xmlInputReadCallback ioRead, xmlInputCloseCallback ioClose, void *ioCtxt, const char *encoding, xmlParserInputFlags flags); -XML_HIDDEN xmlParserInputPtr +XML_HIDDEN xmlParserInput * xmlNewPushInput(const char *url, const char *chunk, int size); XML_HIDDEN xmlChar * -xmlExpandEntitiesInAttValue(xmlParserCtxtPtr ctxt, const xmlChar *str, +xmlExpandEntitiesInAttValue(xmlParserCtxt *ctxt, const xmlChar *str, int normalize); XML_HIDDEN void -xmlParserCheckEOF(xmlParserCtxtPtr ctxt, xmlParserErrors code); +xmlParserCheckEOF(xmlParserCtxt *ctxt, xmlParserErrors code); #endif /* XML_PARSER_H_PRIVATE__ */ diff --git a/include/private/regexp.h b/include/private/regexp.h index b55c932b..b9f6a163 100644 --- a/include/private/regexp.h +++ b/include/private/regexp.h @@ -16,7 +16,7 @@ #define XML_REGEXP_INVALID_UTF8 (-7) XML_HIDDEN void -xmlAutomataSetFlags(xmlAutomataPtr am, int flags); +xmlAutomataSetFlags(xmlAutomata *am, int flags); #endif /* LIBXML_REGEXP_ENABLED */ diff --git a/include/private/save.h b/include/private/save.h index 5d4a753f..ea539332 100644 --- a/include/private/save.h +++ b/include/private/save.h @@ -8,15 +8,15 @@ #ifdef LIBXML_OUTPUT_ENABLED XML_HIDDEN int -xmlSaveNotationDecl(xmlSaveCtxtPtr ctxt, xmlNotationPtr cur); +xmlSaveNotationDecl(xmlSaveCtxt *ctxt, xmlNotation *cur); XML_HIDDEN int -xmlSaveNotationTable(xmlSaveCtxtPtr ctxt, xmlNotationTablePtr cur); +xmlSaveNotationTable(xmlSaveCtxt *ctxt, xmlNotationTable *cur); XML_HIDDEN void -xmlBufAttrSerializeTxtContent(xmlOutputBufferPtr buf, xmlDocPtr doc, +xmlBufAttrSerializeTxtContent(xmlOutputBuffer *buf, xmlDoc *doc, const xmlChar *string); XML_HIDDEN void -xmlNsListDumpOutput(xmlOutputBufferPtr buf, xmlNsPtr cur); +xmlNsListDumpOutput(xmlOutputBuffer *buf, xmlNs *cur); #endif /* LIBXML_OUTPUT_ENABLED */ diff --git a/include/private/threads.h b/include/private/threads.h index 95b38254..643e18ce 100644 --- a/include/private/threads.h +++ b/include/private/threads.h @@ -49,13 +49,13 @@ struct _xmlRMutex { }; XML_HIDDEN void -xmlInitMutex(xmlMutexPtr mutex); +xmlInitMutex(xmlMutex *mutex); XML_HIDDEN void -xmlCleanupMutex(xmlMutexPtr mutex); +xmlCleanupMutex(xmlMutex *mutex); XML_HIDDEN void -xmlInitRMutex(xmlRMutexPtr mutex); +xmlInitRMutex(xmlRMutex *mutex); XML_HIDDEN void -xmlCleanupRMutex(xmlRMutexPtr mutex); +xmlCleanupRMutex(xmlRMutex *mutex); #endif /* XML_THREADS_H_PRIVATE__ */ diff --git a/include/private/tree.h b/include/private/tree.h index 743a6082..51417184 100644 --- a/include/private/tree.h +++ b/include/private/tree.h @@ -5,17 +5,17 @@ XML_HIDDEN extern int xmlRegisterCallbacks; XML_HIDDEN int -xmlSearchNsSafe(xmlNodePtr node, const xmlChar *href, xmlNsPtr *out); +xmlSearchNsSafe(xmlNode *node, const xmlChar *href, xmlNs **out); XML_HIDDEN int -xmlSearchNsByHrefSafe(xmlNodePtr node, const xmlChar *href, xmlNsPtr *out); +xmlSearchNsByHrefSafe(xmlNode *node, const xmlChar *href, xmlNs **out); XML_HIDDEN int -xmlNodeParseContent(xmlNodePtr node, const xmlChar *content, int len); -XML_HIDDEN xmlNodePtr -xmlStaticCopyNode(xmlNodePtr node, xmlDocPtr doc, xmlNodePtr parent, +xmlNodeParseContent(xmlNode *node, const xmlChar *content, int len); +XML_HIDDEN xmlNode * +xmlStaticCopyNode(xmlNode *node, xmlDoc *doc, xmlNode *parent, int extended); -XML_HIDDEN xmlNodePtr -xmlStaticCopyNodeList(xmlNodePtr node, xmlDocPtr doc, xmlNodePtr parent); +XML_HIDDEN xmlNode * +xmlStaticCopyNodeList(xmlNode *node, xmlDoc *doc, xmlNode *parent); XML_HIDDEN const xmlChar * xmlSplitQName4(const xmlChar *name, xmlChar **prefixPtr); diff --git a/include/private/xinclude.h b/include/private/xinclude.h index 43c77e50..a079093f 100644 --- a/include/private/xinclude.h +++ b/include/private/xinclude.h @@ -4,6 +4,6 @@ #include XML_HIDDEN int -xmlXIncludeSetStreamingMode(xmlXIncludeCtxtPtr ctxt, int mode); +xmlXIncludeSetStreamingMode(xmlXIncludeCtxt *ctxt, int mode); #endif /* XML_INCLUDE_H_PRIVATE__ */ diff --git a/include/private/xpath.h b/include/private/xpath.h index 72a69720..c3014640 100644 --- a/include/private/xpath.h +++ b/include/private/xpath.h @@ -8,9 +8,9 @@ xmlInitXPathInternal(void); #ifdef LIBXML_XPATH_ENABLED XML_HIDDEN void -xmlXPathErrMemory(xmlXPathContextPtr ctxt); +xmlXPathErrMemory(xmlXPathContext *ctxt); XML_HIDDEN void -xmlXPathPErrMemory(xmlXPathParserContextPtr ctxt); +xmlXPathPErrMemory(xmlXPathParserContext *ctxt); #endif #endif /* XML_XPATH_H_PRIVATE__ */ diff --git a/list.c b/list.c index c94c348a..c112ab9c 100644 --- a/list.c +++ b/list.c @@ -171,7 +171,7 @@ xmlListLinkReverseSearch(xmlListPtr l, void *data) * @param compare an optional comparison function * @returns the new list or NULL in case of error */ -xmlListPtr +xmlList * xmlListCreate(xmlListDeallocator deallocator, xmlListDataCompare compare) { xmlListPtr l; @@ -210,7 +210,7 @@ xmlListCreate(xmlListDeallocator deallocator, xmlListDataCompare compare) * @returns the value associated to `data` or NULL in case of error */ void * -xmlListSearch(xmlListPtr l, void *data) +xmlListSearch(xmlList *l, void *data) { xmlLinkPtr lk; if (l == NULL) @@ -229,7 +229,7 @@ xmlListSearch(xmlListPtr l, void *data) * @returns the value associated to `data` or NULL in case of error */ void * -xmlListReverseSearch(xmlListPtr l, void *data) +xmlListReverseSearch(xmlList *l, void *data) { xmlLinkPtr lk; if (l == NULL) @@ -248,7 +248,7 @@ xmlListReverseSearch(xmlListPtr l, void *data) * @returns 0 in case of success, 1 in case of failure */ int -xmlListInsert(xmlListPtr l, void *data) +xmlListInsert(xmlList *l, void *data) { xmlLinkPtr lkPlace, lkNew; @@ -275,7 +275,7 @@ xmlListInsert(xmlListPtr l, void *data) * @param data the data * @returns 0 in case of success, 1 in case of failure */ -int xmlListAppend(xmlListPtr l, void *data) +int xmlListAppend(xmlList *l, void *data) { xmlLinkPtr lkPlace, lkNew; @@ -299,7 +299,7 @@ int xmlListAppend(xmlListPtr l, void *data) * * @param l a list */ -void xmlListDelete(xmlListPtr l) +void xmlListDelete(xmlList *l) { if (l == NULL) return; @@ -317,7 +317,7 @@ void xmlListDelete(xmlListPtr l) * @returns 1 if a deallocation occurred, or 0 if not found */ int -xmlListRemoveFirst(xmlListPtr l, void *data) +xmlListRemoveFirst(xmlList *l, void *data) { xmlLinkPtr lk; @@ -340,7 +340,7 @@ xmlListRemoveFirst(xmlListPtr l, void *data) * @returns 1 if a deallocation occurred, or 0 if not found */ int -xmlListRemoveLast(xmlListPtr l, void *data) +xmlListRemoveLast(xmlList *l, void *data) { xmlLinkPtr lk; @@ -363,7 +363,7 @@ xmlListRemoveLast(xmlListPtr l, void *data) * @returns the number of deallocation, or 0 if not found */ int -xmlListRemoveAll(xmlListPtr l, void *data) +xmlListRemoveAll(xmlList *l, void *data) { int count=0; @@ -381,7 +381,7 @@ xmlListRemoveAll(xmlListPtr l, void *data) * @param l a list */ void -xmlListClear(xmlListPtr l) +xmlListClear(xmlList *l) { xmlLinkPtr lk; @@ -403,7 +403,7 @@ xmlListClear(xmlListPtr l) * @returns 1 if the list is empty, 0 if not empty and -1 in case of error */ int -xmlListEmpty(xmlListPtr l) +xmlListEmpty(xmlList *l) { if (l == NULL) return(-1); @@ -416,8 +416,8 @@ xmlListEmpty(xmlListPtr l) * @param l a list * @returns the first element in the list, or NULL */ -xmlLinkPtr -xmlListFront(xmlListPtr l) +xmlLink * +xmlListFront(xmlList *l) { if (l == NULL) return(NULL); @@ -430,8 +430,8 @@ xmlListFront(xmlListPtr l) * @param l a list * @returns the last element in the list, or NULL */ -xmlLinkPtr -xmlListEnd(xmlListPtr l) +xmlLink * +xmlListEnd(xmlList *l) { if (l == NULL) return(NULL); @@ -445,7 +445,7 @@ xmlListEnd(xmlListPtr l) * @returns the number of elements in the list or -1 in case of error */ int -xmlListSize(xmlListPtr l) +xmlListSize(xmlList *l) { xmlLinkPtr lk; int count=0; @@ -463,7 +463,7 @@ xmlListSize(xmlListPtr l) * @param l a list */ void -xmlListPopFront(xmlListPtr l) +xmlListPopFront(xmlList *l) { if(!xmlListEmpty(l)) xmlLinkDeallocator(l, l->sentinel->next); @@ -475,7 +475,7 @@ xmlListPopFront(xmlListPtr l) * @param l a list */ void -xmlListPopBack(xmlListPtr l) +xmlListPopBack(xmlList *l) { if(!xmlListEmpty(l)) xmlLinkDeallocator(l, l->sentinel->prev); @@ -489,7 +489,7 @@ xmlListPopBack(xmlListPtr l) * @returns 1 if successful, 0 otherwise */ int -xmlListPushFront(xmlListPtr l, void *data) +xmlListPushFront(xmlList *l, void *data) { xmlLinkPtr lkPlace, lkNew; @@ -516,7 +516,7 @@ xmlListPushFront(xmlListPtr l, void *data) * @returns 1 if successful, 0 otherwise */ int -xmlListPushBack(xmlListPtr l, void *data) +xmlListPushBack(xmlList *l, void *data) { xmlLinkPtr lkPlace, lkNew; @@ -542,7 +542,7 @@ xmlListPushBack(xmlListPtr l, void *data) * @returns a pointer to the data referenced from this link */ void * -xmlLinkGetData(xmlLinkPtr lk) +xmlLinkGetData(xmlLink *lk) { if (lk == NULL) return(NULL); @@ -555,7 +555,7 @@ xmlLinkGetData(xmlLinkPtr lk) * @param l a list */ void -xmlListReverse(xmlListPtr l) +xmlListReverse(xmlList *l) { xmlLinkPtr lk; xmlLinkPtr lkPrev; @@ -579,7 +579,7 @@ xmlListReverse(xmlListPtr l) * @param l a list */ void -xmlListSort(xmlListPtr l) +xmlListSort(xmlList *l) { xmlListPtr lTemp; @@ -611,7 +611,7 @@ xmlListSort(xmlListPtr l) * @param user a user parameter passed to the walker function */ void -xmlListWalk(xmlListPtr l, xmlListWalker walker, void *user) { +xmlListWalk(xmlList *l, xmlListWalker walker, void *user) { xmlLinkPtr lk; if ((l == NULL) || (walker == NULL)) @@ -631,7 +631,7 @@ xmlListWalk(xmlListPtr l, xmlListWalker walker, void *user) { * @param user a user parameter passed to the walker function */ void -xmlListReverseWalk(xmlListPtr l, xmlListWalker walker, void *user) { +xmlListReverseWalk(xmlList *l, xmlListWalker walker, void *user) { xmlLinkPtr lk; if ((l == NULL) || (walker == NULL)) @@ -650,7 +650,7 @@ xmlListReverseWalk(xmlListPtr l, xmlListWalker walker, void *user) { * @param l2 the new list */ void -xmlListMerge(xmlListPtr l1, xmlListPtr l2) +xmlListMerge(xmlList *l1, xmlList *l2) { xmlListCopy(l1, l2); xmlListClear(l2); @@ -662,8 +662,8 @@ xmlListMerge(xmlListPtr l1, xmlListPtr l2) * @param old the list * @returns a new copy of the list or NULL in case of error */ -xmlListPtr -xmlListDup(xmlListPtr old) +xmlList * +xmlListDup(xmlList *old) { xmlListPtr cur; @@ -691,7 +691,7 @@ xmlListDup(xmlListPtr old) * @returns 0 in case of success 1 in case of error */ int -xmlListCopy(xmlListPtr cur, xmlListPtr old) +xmlListCopy(xmlList *cur, xmlList *old) { /* Walk the old tree and insert the data into the new one */ xmlLinkPtr lk; diff --git a/parser.c b/parser.c index 276d40ac..a92e4930 100644 --- a/parser.c +++ b/parser.c @@ -1565,7 +1565,7 @@ xmlParserNsLookupUri(xmlParserCtxtPtr ctxt, const xmlHashedString *prefix) { * @returns the data on success, NULL if no namespace was found. */ void * -xmlParserNsLookupSax(xmlParserCtxtPtr ctxt, const xmlChar *prefix) { +xmlParserNsLookupSax(xmlParserCtxt *ctxt, const xmlChar *prefix) { xmlHashedString hprefix; int nsIndex; @@ -1595,7 +1595,7 @@ xmlParserNsLookupSax(xmlParserCtxtPtr ctxt, const xmlChar *prefix) { * @returns the data on success, NULL if no namespace was found. */ int -xmlParserNsUpdateSax(xmlParserCtxtPtr ctxt, const xmlChar *prefix, +xmlParserNsUpdateSax(xmlParserCtxt *ctxt, const xmlChar *prefix, void *saxData) { xmlHashedString hprefix; int nsIndex; @@ -1890,7 +1890,7 @@ mem_error: * @returns -1 in case of error, the index in the stack otherwise */ int -xmlCtxtPushInput(xmlParserCtxtPtr ctxt, xmlParserInputPtr value) +xmlCtxtPushInput(xmlParserCtxt *ctxt, xmlParserInput *value) { char *directory = NULL; int maxDepth; @@ -1958,8 +1958,8 @@ xmlCtxtPushInput(xmlParserCtxtPtr ctxt, xmlParserInputPtr value) * @param ctxt an XML parser context * @returns the input just removed */ -xmlParserInputPtr -xmlCtxtPopInput(xmlParserCtxtPtr ctxt) +xmlParserInput * +xmlCtxtPopInput(xmlParserCtxt *ctxt) { xmlParserInputPtr ret; @@ -1987,7 +1987,7 @@ xmlCtxtPopInput(xmlParserCtxtPtr ctxt) * @returns -1 in case of error, the index in the stack otherwise */ int -nodePush(xmlParserCtxtPtr ctxt, xmlNodePtr value) +nodePush(xmlParserCtxt *ctxt, xmlNode *value) { if (ctxt == NULL) return(0); @@ -2030,8 +2030,8 @@ nodePush(xmlParserCtxtPtr ctxt, xmlNodePtr value) * @param ctxt an XML parser context * @returns the node just removed */ -xmlNodePtr -nodePop(xmlParserCtxtPtr ctxt) +xmlNode * +nodePop(xmlParserCtxt *ctxt) { xmlNodePtr ret; @@ -2322,7 +2322,7 @@ xmlCurrentCharRecover(xmlParserCtxtPtr ctxt, int *len) { * @returns the number of space chars skipped */ int -xmlSkipBlankChars(xmlParserCtxtPtr ctxt) { +xmlSkipBlankChars(xmlParserCtxt *ctxt) { const xmlChar *cur; int res = 0; @@ -2476,7 +2476,7 @@ xmlSkipBlankCharsPE(xmlParserCtxtPtr ctxt) { * @returns the current xmlChar in the parser context */ xmlChar -xmlPopInput(xmlParserCtxtPtr ctxt) { +xmlPopInput(xmlParserCtxt *ctxt) { xmlParserInputPtr input; if ((ctxt == NULL) || (ctxt->inputNr <= 1)) return(0); @@ -2497,7 +2497,7 @@ xmlPopInput(xmlParserCtxtPtr ctxt) { * @returns -1 in case of error or the index in the input stack */ int -xmlPushInput(xmlParserCtxtPtr ctxt, xmlParserInputPtr input) { +xmlPushInput(xmlParserCtxt *ctxt, xmlParserInput *input) { int ret; if ((ctxt == NULL) || (input == NULL)) @@ -2525,7 +2525,7 @@ xmlPushInput(xmlParserCtxtPtr ctxt, xmlParserInputPtr input) { * @returns the value parsed (as an int), 0 in case of error */ int -xmlParseCharRef(xmlParserCtxtPtr ctxt) { +xmlParseCharRef(xmlParserCtxt *ctxt) { int val = 0; int count = 0; @@ -2739,7 +2739,7 @@ xmlParseStringCharRef(xmlParserCtxtPtr ctxt, const xmlChar **str) { * @param ctxt the parser context */ void -xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) { +xmlParserHandlePEReference(xmlParserCtxt *ctxt) { xmlParsePEReference(ctxt); } @@ -2757,7 +2757,7 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) { * must deallocate it ! */ xmlChar * -xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, +xmlStringLenDecodeEntities(xmlParserCtxt *ctxt, const xmlChar *str, int len, int what ATTRIBUTE_UNUSED, xmlChar end, xmlChar end2, xmlChar end3) { if ((ctxt == NULL) || (str == NULL) || (len < 0)) @@ -2783,7 +2783,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, * must deallocate it ! */ xmlChar * -xmlStringDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, +xmlStringDecodeEntities(xmlParserCtxt *ctxt, const xmlChar *str, int what ATTRIBUTE_UNUSED, xmlChar end, xmlChar end2, xmlChar end3) { if ((ctxt == NULL) || (str == NULL)) @@ -2906,7 +2906,7 @@ static int areBlanks(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, */ xmlChar * -xmlSplitQName(xmlParserCtxtPtr ctxt, const xmlChar *name, xmlChar **prefixOut) { +xmlSplitQName(xmlParserCtxt *ctxt, const xmlChar *name, xmlChar **prefixOut) { xmlChar buf[XML_MAX_NAMELEN + 5]; xmlChar *buffer = NULL; int len = 0; @@ -3301,7 +3301,7 @@ xmlParseNameComplex(xmlParserCtxtPtr ctxt) { */ const xmlChar * -xmlParseName(xmlParserCtxtPtr ctxt) { +xmlParseName(xmlParserCtxt *ctxt) { const xmlChar *in; const xmlChar *ret; size_t count = 0; @@ -3587,7 +3587,7 @@ xmlParseStringName(xmlParserCtxtPtr ctxt, const xmlChar** str) { */ xmlChar * -xmlParseNmtoken(xmlParserCtxtPtr ctxt) { +xmlParseNmtoken(xmlParserCtxt *ctxt) { xmlChar buf[XML_MAX_NAMELEN + 5]; xmlChar *ret; int len = 0, l; @@ -3817,7 +3817,7 @@ xmlExpandPEsInEntityValue(xmlParserCtxtPtr ctxt, xmlSBuf *buf, * @returns the EntityValue parsed with reference substituted or NULL */ xmlChar * -xmlParseEntityValue(xmlParserCtxtPtr ctxt, xmlChar **orig) { +xmlParseEntityValue(xmlParserCtxt *ctxt, xmlChar **orig) { unsigned maxLength = (ctxt->options & XML_PARSE_HUGE) ? XML_MAX_HUGE_LENGTH : XML_MAX_TEXT_LENGTH; @@ -4164,7 +4164,7 @@ xmlExpandEntityInAttValue(xmlParserCtxtPtr ctxt, xmlSBuf *buf, * @returns the expanded attribtue value. */ xmlChar * -xmlExpandEntitiesInAttValue(xmlParserCtxtPtr ctxt, const xmlChar *str, +xmlExpandEntitiesInAttValue(xmlParserCtxt *ctxt, const xmlChar *str, int normalize) { unsigned maxLength = (ctxt->options & XML_PARSE_HUGE) ? XML_MAX_HUGE_LENGTH : @@ -4487,7 +4487,7 @@ error: * caller. */ xmlChar * -xmlParseAttValue(xmlParserCtxtPtr ctxt) { +xmlParseAttValue(xmlParserCtxt *ctxt) { if ((ctxt == NULL) || (ctxt->input == NULL)) return(NULL); return(xmlParseAttValueInternal(ctxt, NULL, NULL, 0, 0)); } @@ -4504,7 +4504,7 @@ xmlParseAttValue(xmlParserCtxtPtr ctxt) { */ xmlChar * -xmlParseSystemLiteral(xmlParserCtxtPtr ctxt) { +xmlParseSystemLiteral(xmlParserCtxt *ctxt) { xmlChar *buf = NULL; int len = 0; int size = XML_PARSER_BUFFER_SIZE; @@ -4576,7 +4576,7 @@ xmlParseSystemLiteral(xmlParserCtxtPtr ctxt) { */ xmlChar * -xmlParsePubidLiteral(xmlParserCtxtPtr ctxt) { +xmlParsePubidLiteral(xmlParserCtxt *ctxt) { xmlChar *buf = NULL; int len = 0; int size = XML_PARSER_BUFFER_SIZE; @@ -4895,7 +4895,7 @@ xmlParseCharDataComplex(xmlParserCtxtPtr ctxt, int partial) { * @param cdata unused */ void -xmlParseCharData(xmlParserCtxtPtr ctxt, ATTRIBUTE_UNUSED int cdata) { +xmlParseCharData(xmlParserCtxt *ctxt, ATTRIBUTE_UNUSED int cdata) { xmlParseCharDataInternal(ctxt, 0); } @@ -4922,7 +4922,7 @@ xmlParseCharData(xmlParserCtxtPtr ctxt, ATTRIBUTE_UNUSED int cdata) { */ xmlChar * -xmlParseExternalID(xmlParserCtxtPtr ctxt, xmlChar **publicID, int strict) { +xmlParseExternalID(xmlParserCtxt *ctxt, xmlChar **publicID, int strict) { xmlChar *URI = NULL; *publicID = NULL; @@ -5099,7 +5099,7 @@ not_terminated: * @param ctxt an XML parser context */ void -xmlParseComment(xmlParserCtxtPtr ctxt) { +xmlParseComment(xmlParserCtxt *ctxt) { xmlChar *buf = NULL; size_t size = XML_PARSER_BUFFER_SIZE; size_t len = 0; @@ -5251,7 +5251,7 @@ get_more: */ const xmlChar * -xmlParsePITarget(xmlParserCtxtPtr ctxt) { +xmlParsePITarget(xmlParserCtxt *ctxt) { const xmlChar *name; name = xmlParseName(ctxt); @@ -5365,7 +5365,7 @@ error: */ void -xmlParsePI(xmlParserCtxtPtr ctxt) { +xmlParsePI(xmlParserCtxt *ctxt) { xmlChar *buf = NULL; size_t len = 0; size_t size = XML_PARSER_BUFFER_SIZE; @@ -5489,7 +5489,7 @@ xmlParsePI(xmlParserCtxtPtr ctxt) { */ void -xmlParseNotationDecl(xmlParserCtxtPtr ctxt) { +xmlParseNotationDecl(xmlParserCtxt *ctxt) { const xmlChar *name; xmlChar *Pubid; xmlChar *Systemid; @@ -5571,7 +5571,7 @@ xmlParseNotationDecl(xmlParserCtxtPtr ctxt) { */ void -xmlParseEntityDecl(xmlParserCtxtPtr ctxt) { +xmlParseEntityDecl(xmlParserCtxt *ctxt) { const xmlChar *name = NULL; xmlChar *value = NULL; xmlChar *URI = NULL, *literal = NULL; @@ -5818,7 +5818,7 @@ done: */ int -xmlParseDefaultDecl(xmlParserCtxtPtr ctxt, xmlChar **value) { +xmlParseDefaultDecl(xmlParserCtxt *ctxt, xmlChar **value) { int val; xmlChar *ret; @@ -5866,8 +5866,8 @@ xmlParseDefaultDecl(xmlParserCtxtPtr ctxt, xmlChar **value) { * @returns the notation attribute tree built while parsing */ -xmlEnumerationPtr -xmlParseNotationType(xmlParserCtxtPtr ctxt) { +xmlEnumeration * +xmlParseNotationType(xmlParserCtxt *ctxt) { const xmlChar *name; xmlEnumerationPtr ret = NULL, last = NULL, cur, tmp; @@ -5936,8 +5936,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) { * @returns the enumeration attribute tree built while parsing */ -xmlEnumerationPtr -xmlParseEnumerationType(xmlParserCtxtPtr ctxt) { +xmlEnumeration * +xmlParseEnumerationType(xmlParserCtxt *ctxt) { xmlChar *name; xmlEnumerationPtr ret = NULL, last = NULL, cur, tmp; @@ -6005,7 +6005,7 @@ xmlParseEnumerationType(xmlParserCtxtPtr ctxt) { */ int -xmlParseEnumeratedType(xmlParserCtxtPtr ctxt, xmlEnumerationPtr *tree) { +xmlParseEnumeratedType(xmlParserCtxt *ctxt, xmlEnumeration **tree) { if (CMP8(CUR_PTR, 'N', 'O', 'T', 'A', 'T', 'I', 'O', 'N')) { SKIP(8); if (SKIP_BLANKS_PE == 0) { @@ -6068,7 +6068,7 @@ xmlParseEnumeratedType(xmlParserCtxtPtr ctxt, xmlEnumerationPtr *tree) { * @returns the attribute type */ int -xmlParseAttributeType(xmlParserCtxtPtr ctxt, xmlEnumerationPtr *tree) { +xmlParseAttributeType(xmlParserCtxt *ctxt, xmlEnumeration **tree) { if (CMP5(CUR_PTR, 'C', 'D', 'A', 'T', 'A')) { SKIP(5); return(XML_ATTRIBUTE_CDATA); @@ -6108,7 +6108,7 @@ xmlParseAttributeType(xmlParserCtxtPtr ctxt, xmlEnumerationPtr *tree) { * @param ctxt an XML parser context */ void -xmlParseAttributeListDecl(xmlParserCtxtPtr ctxt) { +xmlParseAttributeListDecl(xmlParserCtxt *ctxt) { const xmlChar *elemName; const xmlChar *attrName; xmlEnumerationPtr tree; @@ -6239,8 +6239,8 @@ xmlParseAttributeListDecl(xmlParserCtxtPtr ctxt) { * @param inputchk the input used for the current entity, needed for boundary checks * @returns the list of the xmlElementContentPtr describing the element choices */ -xmlElementContentPtr -xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) { +xmlElementContent * +xmlParseElementMixedContentDecl(xmlParserCtxt *ctxt, int inputchk) { xmlElementContentPtr ret = NULL, cur = NULL, n; const xmlChar *elem = NULL; @@ -6666,8 +6666,8 @@ xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk, * @returns the tree of xmlElementContentPtr describing the element * hierarchy. */ -xmlElementContentPtr -xmlParseElementChildrenContentDecl(xmlParserCtxtPtr ctxt, int inputchk) { +xmlElementContent * +xmlParseElementChildrenContentDecl(xmlParserCtxt *ctxt, int inputchk) { /* stub left for API/ABI compat */ return(xmlParseElementChildrenContentDeclPriv(ctxt, inputchk, 1)); } @@ -6687,8 +6687,8 @@ xmlParseElementChildrenContentDecl(xmlParserCtxtPtr ctxt, int inputchk) { */ int -xmlParseElementContentDecl(xmlParserCtxtPtr ctxt, const xmlChar *name, - xmlElementContentPtr *result) { +xmlParseElementContentDecl(xmlParserCtxt *ctxt, const xmlChar *name, + xmlElementContent **result) { xmlElementContentPtr tree = NULL; int inputid = ctxt->input->id; @@ -6730,7 +6730,7 @@ xmlParseElementContentDecl(xmlParserCtxtPtr ctxt, const xmlChar *name, * @returns the type of the element, or -1 in case of error */ int -xmlParseElementDecl(xmlParserCtxtPtr ctxt) { +xmlParseElementDecl(xmlParserCtxt *ctxt) { const xmlChar *name; int ret = -1; xmlElementContentPtr content = NULL; @@ -6987,7 +6987,7 @@ error: * @param ctxt an XML parser context */ void -xmlParseMarkupDecl(xmlParserCtxtPtr ctxt) { +xmlParseMarkupDecl(xmlParserCtxt *ctxt) { GROW; if (CUR == '<') { if (NXT(1) == '!') { @@ -7034,7 +7034,7 @@ xmlParseMarkupDecl(xmlParserCtxtPtr ctxt) { */ void -xmlParseTextDecl(xmlParserCtxtPtr ctxt) { +xmlParseTextDecl(xmlParserCtxt *ctxt) { xmlChar *version; /* @@ -7108,7 +7108,7 @@ xmlParseTextDecl(xmlParserCtxtPtr ctxt) { * @param SystemID the system identifier (or URL) */ void -xmlParseExternalSubset(xmlParserCtxtPtr ctxt, const xmlChar *ExternalID, +xmlParseExternalSubset(xmlParserCtxt *ctxt, const xmlChar *ExternalID, const xmlChar *SystemID) { int oldInputNr; @@ -7172,7 +7172,7 @@ xmlParseExternalSubset(xmlParserCtxtPtr ctxt, const xmlChar *ExternalID, * @param ctxt an XML parser context */ void -xmlParseReference(xmlParserCtxtPtr ctxt) { +xmlParseReference(xmlParserCtxt *ctxt) { xmlEntityPtr ent = NULL; const xmlChar *name; xmlChar *val; @@ -7564,8 +7564,8 @@ xmlParseEntityRefInternal(xmlParserCtxtPtr ctxt) { * @param ctxt an XML parser context * @returns the xmlEntityPtr if found, or NULL otherwise. */ -xmlEntityPtr -xmlParseEntityRef(xmlParserCtxtPtr ctxt) { +xmlEntity * +xmlParseEntityRef(xmlParserCtxt *ctxt) { const xmlChar *name; if (ctxt == NULL) @@ -7672,7 +7672,7 @@ xmlParseStringEntityRef(xmlParserCtxtPtr ctxt, const xmlChar ** str) { * @param ctxt an XML parser context */ void -xmlParsePEReference(xmlParserCtxtPtr ctxt) +xmlParsePEReference(xmlParserCtxt *ctxt) { const xmlChar *name; xmlEntityPtr entity = NULL; @@ -7994,7 +7994,7 @@ xmlParseStringPEReference(xmlParserCtxtPtr ctxt, const xmlChar **str) { */ void -xmlParseDocTypeDecl(xmlParserCtxtPtr ctxt) { +xmlParseDocTypeDecl(xmlParserCtxt *ctxt) { const xmlChar *name = NULL; xmlChar *ExternalID = NULL; xmlChar *URI = NULL; @@ -8145,7 +8145,7 @@ xmlParseInternalSubset(xmlParserCtxtPtr ctxt) { */ const xmlChar * -xmlParseAttribute(xmlParserCtxtPtr ctxt, xmlChar **value) { +xmlParseAttribute(xmlParserCtxt *ctxt, xmlChar **value) { const xmlChar *name; xmlChar *val; @@ -8232,7 +8232,7 @@ xmlParseAttribute(xmlParserCtxtPtr ctxt, xmlChar **value) { */ const xmlChar * -xmlParseStartTag(xmlParserCtxtPtr ctxt) { +xmlParseStartTag(xmlParserCtxt *ctxt) { const xmlChar *name; const xmlChar *attname; xmlChar *attvalue; @@ -8423,7 +8423,7 @@ xmlParseEndTag1(xmlParserCtxtPtr ctxt, int line) { */ void -xmlParseEndTag(xmlParserCtxtPtr ctxt) { +xmlParseEndTag(xmlParserCtxt *ctxt) { xmlParseEndTag1(ctxt, 0); } #endif /* LIBXML_SAX1_ENABLED */ @@ -9476,7 +9476,7 @@ xmlParseEndTag2(xmlParserCtxtPtr ctxt, const xmlStartTag *tag) { * @param ctxt an XML parser context */ void -xmlParseCDSect(xmlParserCtxtPtr ctxt) { +xmlParseCDSect(xmlParserCtxt *ctxt) { xmlChar *buf = NULL; int len = 0; int size = XML_PARSER_BUFFER_SIZE; @@ -9678,7 +9678,7 @@ xmlParseContentInternal(xmlParserCtxtPtr ctxt) { * @param ctxt an XML parser context */ void -xmlParseContent(xmlParserCtxtPtr ctxt) { +xmlParseContent(xmlParserCtxt *ctxt) { if ((ctxt == NULL) || (ctxt->input == NULL)) return; @@ -9704,7 +9704,7 @@ xmlParseContent(xmlParserCtxtPtr ctxt) { */ void -xmlParseElement(xmlParserCtxtPtr ctxt) { +xmlParseElement(xmlParserCtxt *ctxt) { if (xmlParseElementStart(ctxt) != 0) return; @@ -9903,7 +9903,7 @@ xmlParseElementEnd(xmlParserCtxtPtr ctxt) { * @returns the string giving the XML version number, or NULL */ xmlChar * -xmlParseVersionNum(xmlParserCtxtPtr ctxt) { +xmlParseVersionNum(xmlParserCtxt *ctxt) { xmlChar *buf = NULL; int len = 0; int size = 10; @@ -9974,7 +9974,7 @@ xmlParseVersionNum(xmlParserCtxtPtr ctxt) { */ xmlChar * -xmlParseVersionInfo(xmlParserCtxtPtr ctxt) { +xmlParseVersionInfo(xmlParserCtxt *ctxt) { xmlChar *version = NULL; if (CMP7(CUR_PTR, 'v', 'e', 'r', 's', 'i', 'o', 'n')) { @@ -10018,7 +10018,7 @@ xmlParseVersionInfo(xmlParserCtxtPtr ctxt) { * @returns the encoding name value or NULL */ xmlChar * -xmlParseEncName(xmlParserCtxtPtr ctxt) { +xmlParseEncName(xmlParserCtxt *ctxt) { xmlChar *buf = NULL; int len = 0; int size = 10; @@ -10089,7 +10089,7 @@ xmlParseEncName(xmlParserCtxtPtr ctxt) { */ const xmlChar * -xmlParseEncodingDecl(xmlParserCtxtPtr ctxt) { +xmlParseEncodingDecl(xmlParserCtxt *ctxt) { xmlChar *encoding = NULL; SKIP_BLANKS; @@ -10166,7 +10166,7 @@ xmlParseEncodingDecl(xmlParserCtxtPtr ctxt) { */ int -xmlParseSDDecl(xmlParserCtxtPtr ctxt) { +xmlParseSDDecl(xmlParserCtxt *ctxt) { int standalone = -2; SKIP_BLANKS; @@ -10228,7 +10228,7 @@ xmlParseSDDecl(xmlParserCtxtPtr ctxt) { */ void -xmlParseXMLDecl(xmlParserCtxtPtr ctxt) { +xmlParseXMLDecl(xmlParserCtxt *ctxt) { xmlChar *version; /* @@ -10340,7 +10340,7 @@ xmlParseXMLDecl(xmlParserCtxtPtr ctxt) { * @returns the version from the XML declaration. */ const xmlChar * -xmlCtxtGetVersion(xmlParserCtxtPtr ctxt) { +xmlCtxtGetVersion(xmlParserCtxt *ctxt) { if (ctxt == NULL) return(NULL); @@ -10354,7 +10354,7 @@ xmlCtxtGetVersion(xmlParserCtxtPtr ctxt) { * @returns the value from the standalone document declaration. */ int -xmlCtxtGetStandalone(xmlParserCtxtPtr ctxt) { +xmlCtxtGetStandalone(xmlParserCtxt *ctxt) { if (ctxt == NULL) return(0); @@ -10371,7 +10371,7 @@ xmlCtxtGetStandalone(xmlParserCtxtPtr ctxt) { */ void -xmlParseMisc(xmlParserCtxtPtr ctxt) { +xmlParseMisc(xmlParserCtxt *ctxt) { while (PARSER_STOPPED(ctxt) == 0) { SKIP_BLANKS; GROW; @@ -10416,7 +10416,7 @@ xmlFinishDocument(xmlParserCtxtPtr ctxt) { */ int -xmlParseDocument(xmlParserCtxtPtr ctxt) { +xmlParseDocument(xmlParserCtxt *ctxt) { if ((ctxt == NULL) || (ctxt->input == NULL)) return(-1); @@ -10541,7 +10541,7 @@ xmlParseDocument(xmlParserCtxtPtr ctxt) { */ int -xmlParseExtParsedEnt(xmlParserCtxtPtr ctxt) { +xmlParseExtParsedEnt(xmlParserCtxt *ctxt) { if ((ctxt == NULL) || (ctxt->input == NULL)) return(-1); @@ -11269,7 +11269,7 @@ done: * @returns an xmlParserErrors code (0 on success). */ int -xmlParseChunk(xmlParserCtxtPtr ctxt, const char *chunk, int size, +xmlParseChunk(xmlParserCtxt *ctxt, const char *chunk, int size, int terminate) { size_t curBase; size_t maxLength; @@ -11392,8 +11392,8 @@ xmlParseChunk(xmlParserCtxtPtr ctxt, const char *chunk, int size, * failed. */ -xmlParserCtxtPtr -xmlCreatePushParserCtxt(xmlSAXHandlerPtr sax, void *user_data, +xmlParserCtxt * +xmlCreatePushParserCtxt(xmlSAXHandler *sax, void *user_data, const char *chunk, int size, const char *filename) { xmlParserCtxtPtr ctxt; xmlParserInputPtr input; @@ -11426,7 +11426,7 @@ xmlCreatePushParserCtxt(xmlSAXHandlerPtr sax, void *user_data, * @param ctxt an XML parser context */ void -xmlStopParser(xmlParserCtxtPtr ctxt) { +xmlStopParser(xmlParserCtxt *ctxt) { if (ctxt == NULL) return; xmlHaltParser(ctxt); @@ -11446,8 +11446,8 @@ xmlStopParser(xmlParserCtxtPtr ctxt) { * @param enc the charset encoding if known (deprecated) * @returns the new parser context or NULL */ -xmlParserCtxtPtr -xmlCreateIOParserCtxt(xmlSAXHandlerPtr sax, void *user_data, +xmlParserCtxt * +xmlCreateIOParserCtxt(xmlSAXHandler *sax, void *user_data, xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void *ioctx, xmlCharEncoding enc) { @@ -11497,8 +11497,8 @@ xmlCreateIOParserCtxt(xmlSAXHandlerPtr sax, void *user_data, * @returns the resulting xmlDtdPtr or NULL in case of error. * `input` will be freed by the function in any case. */ -xmlDtdPtr -xmlCtxtParseDtd(xmlParserCtxtPtr ctxt, xmlParserInputPtr input, +xmlDtd * +xmlCtxtParseDtd(xmlParserCtxt *ctxt, xmlParserInput *input, const xmlChar *publicId, const xmlChar *systemId) { xmlDtdPtr ret = NULL; @@ -11571,8 +11571,8 @@ error: * `input` will be freed by the function in any case. */ -xmlDtdPtr -xmlIOParseDTD(xmlSAXHandlerPtr sax, xmlParserInputBufferPtr input, +xmlDtd * +xmlIOParseDTD(xmlSAXHandler *sax, xmlParserInputBuffer *input, xmlCharEncoding enc) { xmlDtdPtr ret = NULL; xmlParserCtxtPtr ctxt; @@ -11620,8 +11620,8 @@ xmlIOParseDTD(xmlSAXHandlerPtr sax, xmlParserInputBufferPtr input, * @returns the resulting xmlDtdPtr or NULL in case of error. */ -xmlDtdPtr -xmlSAXParseDTD(xmlSAXHandlerPtr sax, const xmlChar *ExternalID, +xmlDtd * +xmlSAXParseDTD(xmlSAXHandler *sax, const xmlChar *ExternalID, const xmlChar *SystemID) { xmlDtdPtr ret = NULL; xmlParserCtxtPtr ctxt; @@ -11679,7 +11679,7 @@ xmlSAXParseDTD(xmlSAXHandlerPtr sax, const xmlChar *ExternalID, * @returns the resulting xmlDtdPtr or NULL in case of error. */ -xmlDtdPtr +xmlDtd * xmlParseDTD(const xmlChar *ExternalID, const xmlChar *SystemID) { return(xmlSAXParseDTD(NULL, ExternalID, SystemID)); } @@ -11908,8 +11908,8 @@ error: */ int -xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctxt, const xmlChar *URL, - const xmlChar *ID, xmlNodePtr *listOut) { +xmlParseCtxtExternalEntity(xmlParserCtxt *ctxt, const xmlChar *URL, + const xmlChar *ID, xmlNode **listOut) { xmlParserInputPtr input; xmlNodePtr list; @@ -11958,8 +11958,8 @@ xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctxt, const xmlChar *URL, */ int -xmlParseExternalEntity(xmlDocPtr doc, xmlSAXHandlerPtr sax, void *user_data, - int depth, const xmlChar *URL, const xmlChar *ID, xmlNodePtr *list) { +xmlParseExternalEntity(xmlDoc *doc, xmlSAXHandler *sax, void *user_data, + int depth, const xmlChar *URL, const xmlChar *ID, xmlNode **list) { xmlParserCtxtPtr ctxt; int ret; @@ -12001,8 +12001,8 @@ xmlParseExternalEntity(xmlDocPtr doc, xmlSAXHandlerPtr sax, void *user_data, */ int -xmlParseBalancedChunkMemory(xmlDocPtr doc, xmlSAXHandlerPtr sax, - void *user_data, int depth, const xmlChar *string, xmlNodePtr *lst) { +xmlParseBalancedChunkMemory(xmlDoc *doc, xmlSAXHandler *sax, + void *user_data, int depth, const xmlChar *string, xmlNode **lst) { return xmlParseBalancedChunkMemoryRecover( doc, sax, user_data, depth, string, lst, 0 ); } @@ -12024,9 +12024,9 @@ xmlParseBalancedChunkMemory(xmlDocPtr doc, xmlSAXHandlerPtr sax, * @param hasTextDecl whether to parse text declaration * @returns a node list or NULL in case of error. */ -xmlNodePtr -xmlCtxtParseContent(xmlParserCtxtPtr ctxt, xmlParserInputPtr input, - xmlNodePtr node, int hasTextDecl) { +xmlNode * +xmlCtxtParseContent(xmlParserCtxt *ctxt, xmlParserInput *input, + xmlNode *node, int hasTextDecl) { xmlDocPtr doc; xmlNodePtr cur, list = NULL; int nsnr = 0; @@ -12173,8 +12173,8 @@ exit: * error code otherwise */ xmlParserErrors -xmlParseInNodeContext(xmlNodePtr node, const char *data, int datalen, - int options, xmlNodePtr *listOut) { +xmlParseInNodeContext(xmlNode *node, const char *data, int datalen, + int options, xmlNode **listOut) { xmlParserCtxtPtr ctxt; xmlParserInputPtr input; xmlDocPtr doc; @@ -12254,8 +12254,8 @@ xmlParseInNodeContext(xmlNodePtr node, const char *data, int datalen, * otherwise. */ int -xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc, xmlSAXHandlerPtr sax, - void *user_data, int depth, const xmlChar *string, xmlNodePtr *listOut, +xmlParseBalancedChunkMemoryRecover(xmlDoc *doc, xmlSAXHandler *sax, + void *user_data, int depth, const xmlChar *string, xmlNode **listOut, int recover) { xmlParserCtxtPtr ctxt; xmlParserInputPtr input; @@ -12320,8 +12320,8 @@ error: * @returns the resulting document tree */ -xmlDocPtr -xmlSAXParseEntity(xmlSAXHandlerPtr sax, const char *filename) { +xmlDoc * +xmlSAXParseEntity(xmlSAXHandler *sax, const char *filename) { xmlDocPtr ret; xmlParserCtxtPtr ctxt; @@ -12364,7 +12364,7 @@ xmlSAXParseEntity(xmlSAXHandlerPtr sax, const char *filename) { * @returns the resulting document tree */ -xmlDocPtr +xmlDoc * xmlParseEntity(const char *filename) { return(xmlSAXParseEntity(NULL, filename)); } @@ -12382,7 +12382,7 @@ xmlParseEntity(const char *filename) { * @param base a possible base for the target URI * @returns the new parser context or NULL */ -xmlParserCtxtPtr +xmlParserCtxt * xmlCreateEntityParserCtxt(const xmlChar *URL, const xmlChar *ID, const xmlChar *base) { xmlParserCtxtPtr ctxt; @@ -12436,7 +12436,7 @@ error: * @param options a combination of xmlParserOption * @returns the new parser context or NULL */ -xmlParserCtxtPtr +xmlParserCtxt * xmlCreateURLParserCtxt(const char *filename, int options) { xmlParserCtxtPtr ctxt; @@ -12475,7 +12475,7 @@ xmlCreateURLParserCtxt(const char *filename, int options) * @param filename the filename * @returns the new parser context or NULL */ -xmlParserCtxtPtr +xmlParserCtxt * xmlCreateFileParserCtxt(const char *filename) { return(xmlCreateURLParserCtxt(filename, 0)); @@ -12501,8 +12501,8 @@ xmlCreateFileParserCtxt(const char *filename) * @returns the resulting document tree */ -xmlDocPtr -xmlSAXParseFileWithData(xmlSAXHandlerPtr sax, const char *filename, +xmlDoc * +xmlSAXParseFileWithData(xmlSAXHandler *sax, const char *filename, int recovery, void *data) { xmlDocPtr ret = NULL; xmlParserCtxtPtr ctxt; @@ -12547,8 +12547,8 @@ xmlSAXParseFileWithData(xmlSAXHandlerPtr sax, const char *filename, * @returns the resulting document tree */ -xmlDocPtr -xmlSAXParseFile(xmlSAXHandlerPtr sax, const char *filename, +xmlDoc * +xmlSAXParseFile(xmlSAXHandler *sax, const char *filename, int recovery) { return(xmlSAXParseFileWithData(sax,filename,recovery,NULL)); } @@ -12564,7 +12564,7 @@ xmlSAXParseFile(xmlSAXHandlerPtr sax, const char *filename, * @returns the resulting document tree or NULL in case of failure */ -xmlDocPtr +xmlDoc * xmlRecoverDoc(const xmlChar *cur) { return(xmlSAXParseDoc(NULL, cur, 1)); } @@ -12580,7 +12580,7 @@ xmlRecoverDoc(const xmlChar *cur) { * NULL otherwise. */ -xmlDocPtr +xmlDoc * xmlParseFile(const char *filename) { return(xmlSAXParseFile(NULL, filename, 0)); } @@ -12597,7 +12597,7 @@ xmlParseFile(const char *filename) { * @returns the resulting document tree or NULL in case of failure */ -xmlDocPtr +xmlDoc * xmlRecoverFile(const char *filename) { return(xmlSAXParseFile(NULL, filename, 1)); } @@ -12615,7 +12615,7 @@ xmlRecoverFile(const char *filename) { * @param filename a file name */ void -xmlSetupParserForBuffer(xmlParserCtxtPtr ctxt, const xmlChar* buffer, +xmlSetupParserForBuffer(xmlParserCtxt *ctxt, const xmlChar* buffer, const char* filename) { xmlParserInputPtr input; @@ -12645,7 +12645,7 @@ xmlSetupParserForBuffer(xmlParserCtxtPtr ctxt, const xmlChar* buffer, * @returns 0 in case of success or a error number otherwise */ int -xmlSAXUserParseFile(xmlSAXHandlerPtr sax, void *user_data, +xmlSAXUserParseFile(xmlSAXHandler *sax, void *user_data, const char *filename) { int ret = 0; xmlParserCtxtPtr ctxt; @@ -12696,7 +12696,7 @@ xmlSAXUserParseFile(xmlSAXHandlerPtr sax, void *user_data, * @param size the size of the array * @returns the new parser context or NULL */ -xmlParserCtxtPtr +xmlParserCtxt * xmlCreateMemoryParserCtxt(const char *buffer, int size) { xmlParserCtxtPtr ctxt; xmlParserInputPtr input; @@ -12742,8 +12742,8 @@ xmlCreateMemoryParserCtxt(const char *buffer, int size) { * @returns the resulting document tree */ -xmlDocPtr -xmlSAXParseMemoryWithData(xmlSAXHandlerPtr sax, const char *buffer, +xmlDoc * +xmlSAXParseMemoryWithData(xmlSAXHandler *sax, const char *buffer, int size, int recovery, void *data) { xmlDocPtr ret = NULL; xmlParserCtxtPtr ctxt; @@ -12788,8 +12788,8 @@ xmlSAXParseMemoryWithData(xmlSAXHandlerPtr sax, const char *buffer, * documents * @returns the resulting document tree */ -xmlDocPtr -xmlSAXParseMemory(xmlSAXHandlerPtr sax, const char *buffer, +xmlDoc * +xmlSAXParseMemory(xmlSAXHandler *sax, const char *buffer, int size, int recovery) { return xmlSAXParseMemoryWithData(sax, buffer, size, recovery, NULL); } @@ -12804,7 +12804,7 @@ xmlSAXParseMemory(xmlSAXHandlerPtr sax, const char *buffer, * @returns the resulting document tree */ -xmlDocPtr xmlParseMemory(const char *buffer, int size) { +xmlDoc *xmlParseMemory(const char *buffer, int size) { return(xmlSAXParseMemory(NULL, buffer, size, 0)); } @@ -12820,7 +12820,7 @@ xmlDocPtr xmlParseMemory(const char *buffer, int size) { * @returns the resulting document tree or NULL in case of error */ -xmlDocPtr xmlRecoverMemory(const char *buffer, int size) { +xmlDoc *xmlRecoverMemory(const char *buffer, int size) { return(xmlSAXParseMemory(NULL, buffer, size, 1)); } @@ -12835,7 +12835,7 @@ xmlDocPtr xmlRecoverMemory(const char *buffer, int size) { * @param size the length of the XML document in bytes * @returns 0 in case of success or a error number otherwise */ -int xmlSAXUserParseMemory(xmlSAXHandlerPtr sax, void *user_data, +int xmlSAXUserParseMemory(xmlSAXHandler *sax, void *user_data, const char *buffer, int size) { int ret = 0; xmlParserCtxtPtr ctxt; @@ -12878,7 +12878,7 @@ int xmlSAXUserParseMemory(xmlSAXHandlerPtr sax, void *user_data, * @param str a pointer to an array of xmlChar * @returns the new parser context or NULL */ -xmlParserCtxtPtr +xmlParserCtxt * xmlCreateDocParserCtxt(const xmlChar *str) { xmlParserCtxtPtr ctxt; xmlParserInputPtr input; @@ -12916,8 +12916,8 @@ xmlCreateDocParserCtxt(const xmlChar *str) { * @returns the resulting document tree */ -xmlDocPtr -xmlSAXParseDoc(xmlSAXHandlerPtr sax, const xmlChar *cur, int recovery) { +xmlDoc * +xmlSAXParseDoc(xmlSAXHandler *sax, const xmlChar *cur, int recovery) { xmlDocPtr ret; xmlParserCtxtPtr ctxt; xmlSAXHandlerPtr oldsax = NULL; @@ -12956,7 +12956,7 @@ xmlSAXParseDoc(xmlSAXHandlerPtr sax, const xmlChar *cur, int recovery) { * @returns the resulting document tree */ -xmlDocPtr +xmlDoc * xmlParseDoc(const xmlChar *cur) { return(xmlSAXParseDoc(NULL, cur, 0)); } @@ -12985,7 +12985,7 @@ xmlParseDoc(const xmlChar *cur) { * @param ctxt an XML parser context */ void -xmlCtxtReset(xmlParserCtxtPtr ctxt) +xmlCtxtReset(xmlParserCtxt *ctxt) { xmlParserInputPtr input; xmlDictPtr dict; @@ -13088,7 +13088,7 @@ xmlCtxtReset(xmlParserCtxtPtr ctxt) * @returns 0 in case of success and 1 in case of error */ int -xmlCtxtResetPush(xmlParserCtxtPtr ctxt, const char *chunk, +xmlCtxtResetPush(xmlParserCtxt *ctxt, const char *chunk, int size, const char *filename, const char *encoding) { xmlParserInputPtr input; @@ -13204,7 +13204,7 @@ xmlCtxtSetOptionsInternal(xmlParserCtxtPtr ctxt, int options, int keepMask) * in case of error. */ int -xmlCtxtSetOptions(xmlParserCtxtPtr ctxt, int options) +xmlCtxtSetOptions(xmlParserCtxt *ctxt, int options) { #ifdef LIBXML_HTML_ENABLED if ((ctxt != NULL) && (ctxt->html)) @@ -13223,7 +13223,7 @@ xmlCtxtSetOptions(xmlParserCtxtPtr ctxt, int options) * @returns the current options set in the parser context, or -1 if ctxt is NULL. */ int -xmlCtxtGetOptions(xmlParserCtxtPtr ctxt) +xmlCtxtGetOptions(xmlParserCtxt *ctxt) { if (ctxt == NULL) return(-1); @@ -13255,7 +13255,7 @@ xmlCtxtGetOptions(xmlParserCtxtPtr ctxt) * in case of error. */ int -xmlCtxtUseOptions(xmlParserCtxtPtr ctxt, int options) +xmlCtxtUseOptions(xmlParserCtxt *ctxt, int options) { int keepMask; @@ -13295,7 +13295,7 @@ xmlCtxtUseOptions(xmlParserCtxtPtr ctxt, int options) * @param maxAmpl maximum amplification factor */ void -xmlCtxtSetMaxAmplification(xmlParserCtxtPtr ctxt, unsigned maxAmpl) +xmlCtxtSetMaxAmplification(xmlParserCtxt *ctxt, unsigned maxAmpl) { if (ctxt == NULL) return; @@ -13312,8 +13312,8 @@ xmlCtxtSetMaxAmplification(xmlParserCtxtPtr ctxt, unsigned maxAmpl) * @param input parser input * @returns the resulting document tree or NULL */ -xmlDocPtr -xmlCtxtParseDocument(xmlParserCtxtPtr ctxt, xmlParserInputPtr input) +xmlDoc * +xmlCtxtParseDocument(xmlParserCtxt *ctxt, xmlParserInput *input) { xmlDocPtr ret = NULL; @@ -13355,7 +13355,7 @@ xmlCtxtParseDocument(xmlParserCtxtPtr ctxt, xmlParserInputPtr input) * @param options a combination of xmlParserOption * @returns the resulting document tree */ -xmlDocPtr +xmlDoc * xmlReadDoc(const xmlChar *cur, const char *URL, const char *encoding, int options) { @@ -13395,7 +13395,7 @@ xmlReadDoc(const xmlChar *cur, const char *URL, const char *encoding, * @param options a combination of xmlParserOption * @returns the resulting document tree */ -xmlDocPtr +xmlDoc * xmlReadFile(const char *filename, const char *encoding, int options) { xmlParserCtxtPtr ctxt; @@ -13441,7 +13441,7 @@ xmlReadFile(const char *filename, const char *encoding, int options) * @param options a combination of xmlParserOption * @returns the resulting document tree */ -xmlDocPtr +xmlDoc * xmlReadMemory(const char *buffer, int size, const char *url, const char *encoding, int options) { @@ -13482,7 +13482,7 @@ xmlReadMemory(const char *buffer, int size, const char *url, * @param options a combination of xmlParserOption * @returns the resulting document tree */ -xmlDocPtr +xmlDoc * xmlReadFd(int fd, const char *URL, const char *encoding, int options) { xmlParserCtxtPtr ctxt; @@ -13517,7 +13517,7 @@ xmlReadFd(int fd, const char *URL, const char *encoding, int options) * @param options a combination of xmlParserOption * @returns the resulting document tree */ -xmlDocPtr +xmlDoc * xmlReadIO(xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void *ioctx, const char *URL, const char *encoding, int options) { @@ -13556,8 +13556,8 @@ xmlReadIO(xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, * @param options a combination of xmlParserOption * @returns the resulting document tree */ -xmlDocPtr -xmlCtxtReadDoc(xmlParserCtxtPtr ctxt, const xmlChar *str, +xmlDoc * +xmlCtxtReadDoc(xmlParserCtxt *ctxt, const xmlChar *str, const char *URL, const char *encoding, int options) { xmlParserInputPtr input; @@ -13590,8 +13590,8 @@ xmlCtxtReadDoc(xmlParserCtxtPtr ctxt, const xmlChar *str, * @param options a combination of xmlParserOption * @returns the resulting document tree */ -xmlDocPtr -xmlCtxtReadFile(xmlParserCtxtPtr ctxt, const char *filename, +xmlDoc * +xmlCtxtReadFile(xmlParserCtxt *ctxt, const char *filename, const char *encoding, int options) { xmlParserInputPtr input; @@ -13628,8 +13628,8 @@ xmlCtxtReadFile(xmlParserCtxtPtr ctxt, const char *filename, * @param options a combination of xmlParserOption * @returns the resulting document tree */ -xmlDocPtr -xmlCtxtReadMemory(xmlParserCtxtPtr ctxt, const char *buffer, int size, +xmlDoc * +xmlCtxtReadMemory(xmlParserCtxt *ctxt, const char *buffer, int size, const char *URL, const char *encoding, int options) { xmlParserInputPtr input; @@ -13666,8 +13666,8 @@ xmlCtxtReadMemory(xmlParserCtxtPtr ctxt, const char *buffer, int size, * @param options a combination of xmlParserOption * @returns the resulting document tree */ -xmlDocPtr -xmlCtxtReadFd(xmlParserCtxtPtr ctxt, int fd, +xmlDoc * +xmlCtxtReadFd(xmlParserCtxt *ctxt, int fd, const char *URL, const char *encoding, int options) { xmlParserInputPtr input; @@ -13703,8 +13703,8 @@ xmlCtxtReadFd(xmlParserCtxtPtr ctxt, int fd, * @param options a combination of xmlParserOption * @returns the resulting document tree */ -xmlDocPtr -xmlCtxtReadIO(xmlParserCtxtPtr ctxt, xmlInputReadCallback ioread, +xmlDoc * +xmlCtxtReadIO(xmlParserCtxt *ctxt, xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void *ioctx, const char *URL, const char *encoding, int options) diff --git a/parserInternals.c b/parserInternals.c index 6d90c91c..7386915f 100644 --- a/parserInternals.c +++ b/parserInternals.c @@ -113,7 +113,7 @@ xmlCheckVersion(int version) { * @param data data for error handler */ void -xmlCtxtSetErrorHandler(xmlParserCtxtPtr ctxt, xmlStructuredErrorFunc handler, +xmlCtxtSetErrorHandler(xmlParserCtxt *ctxt, xmlStructuredErrorFunc handler, void *data) { if (ctxt == NULL) @@ -171,7 +171,7 @@ xmlCtxtResetLastError(void *ctx) * @param ctxt an XML parser context */ void -xmlCtxtErrMemory(xmlParserCtxtPtr ctxt) +xmlCtxtErrMemory(xmlParserCtxt *ctxt) { xmlStructuredErrorFunc schannel = NULL; xmlGenericErrorFunc channel = NULL; @@ -213,7 +213,7 @@ xmlCtxtErrMemory(xmlParserCtxtPtr ctxt) * @param uri filename or URI (optional) */ void -xmlCtxtErrIO(xmlParserCtxtPtr ctxt, int code, const char *uri) +xmlCtxtErrIO(xmlParserCtxt *ctxt, int code, const char *uri) { const char *errstr, *msg, *str1, *str2; xmlErrorLevel level; @@ -261,7 +261,7 @@ xmlCtxtErrIO(xmlParserCtxtPtr ctxt, int code, const char *uri) * @returns true if the last error is catastrophic. */ int -xmlCtxtIsCatastrophicError(xmlParserCtxtPtr ctxt) { +xmlCtxtIsCatastrophicError(xmlParserCtxt *ctxt) { if (ctxt == NULL) return(1); @@ -285,7 +285,7 @@ xmlCtxtIsCatastrophicError(xmlParserCtxtPtr ctxt) { * @param ap extra parameters for the message display */ void -xmlCtxtVErr(xmlParserCtxtPtr ctxt, xmlNodePtr node, xmlErrorDomain domain, +xmlCtxtVErr(xmlParserCtxt *ctxt, xmlNode *node, xmlErrorDomain domain, xmlParserErrors code, xmlErrorLevel level, const xmlChar *str1, const xmlChar *str2, const xmlChar *str3, int int1, const char *msg, va_list ap) @@ -409,7 +409,7 @@ xmlCtxtVErr(xmlParserCtxtPtr ctxt, xmlNodePtr node, xmlErrorDomain domain, * @param ... extra parameters for the message display */ void -xmlCtxtErr(xmlParserCtxtPtr ctxt, xmlNodePtr node, xmlErrorDomain domain, +xmlCtxtErr(xmlParserCtxt *ctxt, xmlNode *node, xmlErrorDomain domain, xmlParserErrors code, xmlErrorLevel level, const xmlChar *str1, const xmlChar *str2, const xmlChar *str3, int int1, const char *msg, ...) @@ -433,7 +433,7 @@ xmlCtxtErr(xmlParserCtxtPtr ctxt, xmlNodePtr node, xmlErrorDomain domain, * @returns a bitmask of XML_STATUS_* flags ORed together. */ xmlParserStatus -xmlCtxtGetStatus(xmlParserCtxtPtr ctxt) { +xmlCtxtGetStatus(xmlParserCtxt *ctxt) { xmlParserStatus bits = 0; if (xmlCtxtIsCatastrophicError(ctxt)) { @@ -464,7 +464,7 @@ xmlCtxtGetStatus(xmlParserCtxtPtr ctxt) { * @param info extra information string */ void -xmlFatalErr(xmlParserCtxtPtr ctxt, xmlParserErrors code, const char *info) +xmlFatalErr(xmlParserCtxt *ctxt, xmlParserErrors code, const char *info) { const char *errmsg; @@ -513,7 +513,7 @@ xmlIsLetter(int c) { * @param ctxt an XML parser context */ void -xmlHaltParser(xmlParserCtxtPtr ctxt) { +xmlHaltParser(xmlParserCtxt *ctxt) { if (ctxt == NULL) return; ctxt->instate = XML_PARSER_EOF; /* TODO: Remove after refactoring */ @@ -528,7 +528,7 @@ xmlHaltParser(xmlParserCtxtPtr ctxt) { * @returns -1 as this is an error to use it. */ int -xmlParserInputRead(xmlParserInputPtr in ATTRIBUTE_UNUSED, int len ATTRIBUTE_UNUSED) { +xmlParserInputRead(xmlParserInput *in ATTRIBUTE_UNUSED, int len ATTRIBUTE_UNUSED) { return(-1); } @@ -539,7 +539,7 @@ xmlParserInputRead(xmlParserInputPtr in ATTRIBUTE_UNUSED, int len ATTRIBUTE_UNUS * @returns the number of bytes read or -1 in case of error. */ int -xmlParserGrow(xmlParserCtxtPtr ctxt) { +xmlParserGrow(xmlParserCtxt *ctxt) { xmlParserInputPtr in = ctxt->input; xmlParserInputBufferPtr buf = in->buf; size_t curEnd = in->end - in->cur; @@ -588,7 +588,7 @@ xmlParserGrow(xmlParserCtxtPtr ctxt) { * @param code error code */ void -xmlParserCheckEOF(xmlParserCtxtPtr ctxt, xmlParserErrors code) { +xmlParserCheckEOF(xmlParserCtxt *ctxt, xmlParserErrors code) { xmlParserInputPtr in = ctxt->input; xmlParserInputBufferPtr buf; @@ -634,7 +634,7 @@ xmlParserCheckEOF(xmlParserCtxtPtr ctxt, xmlParserErrors code) { * end of this entity */ int -xmlParserInputGrow(xmlParserInputPtr in, int len) { +xmlParserInputGrow(xmlParserInput *in, int len) { int ret; size_t indx; @@ -673,7 +673,7 @@ xmlParserInputGrow(xmlParserInputPtr in, int len) { * @param ctxt an XML parser context */ void -xmlParserShrink(xmlParserCtxtPtr ctxt) { +xmlParserShrink(xmlParserCtxt *ctxt) { xmlParserInputPtr in = ctxt->input; xmlParserInputBufferPtr buf = in->buf; size_t used, res; @@ -707,7 +707,7 @@ xmlParserShrink(xmlParserCtxtPtr ctxt) { * @param in an XML parser input */ void -xmlParserInputShrink(xmlParserInputPtr in) { +xmlParserInputShrink(xmlParserInput *in) { size_t used; size_t ret; @@ -749,7 +749,7 @@ xmlParserInputShrink(xmlParserInputPtr in) { */ void -xmlNextChar(xmlParserCtxtPtr ctxt) +xmlNextChar(xmlParserCtxt *ctxt) { const unsigned char *cur; size_t avail; @@ -856,7 +856,7 @@ encoding_error: */ int -xmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) { +xmlCurrentChar(xmlParserCtxt *ctxt, int *len) { const unsigned char *cur; size_t avail; int c; @@ -994,7 +994,7 @@ incomplete_sequence: */ int -xmlStringCurrentChar(xmlParserCtxtPtr ctxt ATTRIBUTE_UNUSED, +xmlStringCurrentChar(xmlParserCtxt *ctxt ATTRIBUTE_UNUSED, const xmlChar *cur, int *len) { int c; @@ -1090,7 +1090,7 @@ xmlCopyChar(int len ATTRIBUTE_UNUSED, xmlChar *out, int val) { * @param vctxt user data */ void -xmlCtxtSetCharEncConvImpl(xmlParserCtxtPtr ctxt, xmlCharEncConvImpl impl, +xmlCtxtSetCharEncConvImpl(xmlParserCtxt *ctxt, xmlCharEncConvImpl impl, void *vctxt) { if (ctxt == NULL) return; @@ -1194,7 +1194,7 @@ done: * @returns 0 in case of success, -1 otherwise */ int -xmlSwitchEncoding(xmlParserCtxtPtr ctxt, xmlCharEncoding enc) +xmlSwitchEncoding(xmlParserCtxt *ctxt, xmlCharEncoding enc) { xmlCharEncodingHandlerPtr handler = NULL; int ret; @@ -1267,7 +1267,7 @@ xmlSwitchInputEncodingName(xmlParserCtxtPtr ctxt, xmlParserInputPtr input, * @returns 0 in case of success, -1 otherwise */ int -xmlSwitchEncodingName(xmlParserCtxtPtr ctxt, const char *encoding) { +xmlSwitchEncodingName(xmlParserCtxt *ctxt, const char *encoding) { if (ctxt == NULL) return(-1); @@ -1284,8 +1284,8 @@ xmlSwitchEncodingName(xmlParserCtxtPtr ctxt, const char *encoding) { * @returns an xmlParserErrors code. */ xmlParserErrors -xmlInputSetEncodingHandler(xmlParserInputPtr input, - xmlCharEncodingHandlerPtr handler) { +xmlInputSetEncodingHandler(xmlParserInput *input, + xmlCharEncodingHandler *handler) { xmlParserInputBufferPtr in; xmlBufPtr buf; xmlParserErrors code = XML_ERR_OK; @@ -1383,8 +1383,8 @@ xmlInputSetEncodingHandler(xmlParserInputPtr input, * @returns 0 in case of success, -1 otherwise */ int -xmlSwitchInputEncoding(xmlParserCtxtPtr ctxt, xmlParserInputPtr input, - xmlCharEncodingHandlerPtr handler) { +xmlSwitchInputEncoding(xmlParserCtxt *ctxt, xmlParserInput *input, + xmlCharEncodingHandler *handler) { xmlParserErrors code = xmlInputSetEncodingHandler(input, handler); if (code != XML_ERR_OK) { @@ -1406,7 +1406,7 @@ xmlSwitchInputEncoding(xmlParserCtxtPtr ctxt, xmlParserInputPtr input, * @returns 0 in case of success, -1 otherwise */ int -xmlSwitchToEncoding(xmlParserCtxtPtr ctxt, xmlCharEncodingHandlerPtr handler) +xmlSwitchToEncoding(xmlParserCtxt *ctxt, xmlCharEncodingHandler *handler) { xmlParserErrors code; @@ -1430,7 +1430,7 @@ xmlSwitchToEncoding(xmlParserCtxtPtr ctxt, xmlCharEncodingHandlerPtr handler) * @param ctxt the parser context */ void -xmlDetectEncoding(xmlParserCtxtPtr ctxt) { +xmlDetectEncoding(xmlParserCtxt *ctxt) { const xmlChar *in; xmlCharEncoding enc; int bomSize; @@ -1564,7 +1564,7 @@ xmlDetectEncoding(xmlParserCtxtPtr ctxt) { * @param encoding declared encoding */ void -xmlSetDeclaredEncoding(xmlParserCtxtPtr ctxt, xmlChar *encoding) { +xmlSetDeclaredEncoding(xmlParserCtxt *ctxt, xmlChar *encoding) { if (((ctxt->input->flags & XML_INPUT_HAS_ENCODING) == 0) && ((ctxt->options & XML_PARSE_IGNORE_ENC) == 0)) { xmlCharEncodingHandlerPtr handler; @@ -1659,7 +1659,7 @@ xmlSetDeclaredEncoding(xmlParserCtxtPtr ctxt, xmlChar *encoding) { * from the actual encoding. */ const xmlChar * -xmlCtxtGetDeclaredEncoding(xmlParserCtxtPtr ctxt) { +xmlCtxtGetDeclaredEncoding(xmlParserCtxt *ctxt) { if (ctxt == NULL) return(NULL); @@ -1672,7 +1672,7 @@ xmlCtxtGetDeclaredEncoding(xmlParserCtxtPtr ctxt) { * the declared encoding. */ const xmlChar * -xmlGetActualEncoding(xmlParserCtxtPtr ctxt) { +xmlGetActualEncoding(xmlParserCtxt *ctxt) { const xmlChar *encoding = NULL; if ((ctxt->input->flags & XML_INPUT_USES_ENC_DECL) || @@ -1700,7 +1700,7 @@ xmlGetActualEncoding(xmlParserCtxtPtr ctxt) { * @param input an xmlParserInputPtr */ void -xmlFreeInputStream(xmlParserInputPtr input) { +xmlFreeInputStream(xmlParserInput *input) { if (input == NULL) return; if (input->filename != NULL) xmlFree((char *) input->filename); @@ -1720,8 +1720,8 @@ xmlFreeInputStream(xmlParserInputPtr input) { * @param ctxt an XML parser context * @returns the new input stream or NULL */ -xmlParserInputPtr -xmlNewInputStream(xmlParserCtxtPtr ctxt) { +xmlParserInput * +xmlNewInputStream(xmlParserCtxt *ctxt) { xmlParserInputPtr input; input = (xmlParserInputPtr) xmlMalloc(sizeof(xmlParserInput)); @@ -1747,8 +1747,8 @@ xmlNewInputStream(xmlParserCtxtPtr ctxt) { * @param flags unused, pass 0 * @returns a new parser input. */ -xmlParserInputPtr -xmlCtxtNewInputFromUrl(xmlParserCtxtPtr ctxt, const char *url, +xmlParserInput * +xmlCtxtNewInputFromUrl(xmlParserCtxt *ctxt, const char *url, const char *publicId, const char *encoding, xmlParserInputFlags flags ATTRIBUTE_UNUSED) { xmlParserInputPtr input; @@ -1822,7 +1822,7 @@ xmlNewInputInternal(xmlParserInputBufferPtr buf, const char *filename) { * @param flags optimization hints * @returns a new parser input or NULL if a memory allocation failed. */ -xmlParserInputPtr +xmlParserInput * xmlNewInputFromMemory(const char *url, const void *mem, size_t size, xmlParserInputFlags flags) { xmlParserInputBufferPtr buf; @@ -1846,8 +1846,8 @@ xmlNewInputFromMemory(const char *url, const void *mem, size_t size, * @param flags optimization hints * @returns a new parser input or NULL in case of error. */ -xmlParserInputPtr -xmlCtxtNewInputFromMemory(xmlParserCtxtPtr ctxt, const char *url, +xmlParserInput * +xmlCtxtNewInputFromMemory(xmlParserCtxt *ctxt, const char *url, const void *mem, size_t size, const char *encoding, xmlParserInputFlags flags) { xmlParserInputPtr input; @@ -1884,7 +1884,7 @@ xmlCtxtNewInputFromMemory(xmlParserCtxtPtr ctxt, const char *url, * @param flags optimization hints * @returns a new parser input or NULL if a memory allocation failed. */ -xmlParserInputPtr +xmlParserInput * xmlNewInputFromString(const char *url, const char *str, xmlParserInputFlags flags) { xmlParserInputBufferPtr buf; @@ -1907,8 +1907,8 @@ xmlNewInputFromString(const char *url, const char *str, * @param flags optimization hints * @returns a new parser input. */ -xmlParserInputPtr -xmlCtxtNewInputFromString(xmlParserCtxtPtr ctxt, const char *url, +xmlParserInput * +xmlCtxtNewInputFromString(xmlParserCtxt *ctxt, const char *url, const char *str, const char *encoding, xmlParserInputFlags flags) { xmlParserInputPtr input; @@ -1947,7 +1947,7 @@ xmlCtxtNewInputFromString(xmlParserCtxtPtr ctxt, const char *url, * @param flags input flags * @returns a new parser input or NULL if a memory allocation failed. */ -xmlParserInputPtr +xmlParserInput * xmlNewInputFromFd(const char *url, int fd, xmlParserInputFlags flags) { xmlParserInputBufferPtr buf; @@ -1974,8 +1974,8 @@ xmlNewInputFromFd(const char *url, int fd, xmlParserInputFlags flags) { * @param flags unused, pass 0 * @returns a new parser input. */ -xmlParserInputPtr -xmlCtxtNewInputFromFd(xmlParserCtxtPtr ctxt, const char *url, +xmlParserInput * +xmlCtxtNewInputFromFd(xmlParserCtxt *ctxt, const char *url, int fd, const char *encoding, xmlParserInputFlags flags) { xmlParserInputPtr input; @@ -2022,7 +2022,7 @@ xmlCtxtNewInputFromFd(xmlParserCtxtPtr ctxt, const char *url, * @param flags unused, pass 0 * @returns a new parser input or NULL if a memory allocation failed. */ -xmlParserInputPtr +xmlParserInput * xmlNewInputFromIO(const char *url, xmlInputReadCallback ioRead, xmlInputCloseCallback ioClose, void *ioCtxt, xmlParserInputFlags flags ATTRIBUTE_UNUSED) { @@ -2055,8 +2055,8 @@ xmlNewInputFromIO(const char *url, xmlInputReadCallback ioRead, * @param flags unused, pass 0 * @returns a new parser input. */ -xmlParserInputPtr -xmlCtxtNewInputFromIO(xmlParserCtxtPtr ctxt, const char *url, +xmlParserInput * +xmlCtxtNewInputFromIO(xmlParserCtxt *ctxt, const char *url, xmlInputReadCallback ioRead, xmlInputCloseCallback ioClose, void *ioCtxt, const char *encoding, @@ -2086,7 +2086,7 @@ xmlCtxtNewInputFromIO(xmlParserCtxtPtr ctxt, const char *url, * @param size size of array * @returns a new parser input or NULL if a memory allocation failed. */ -xmlParserInputPtr +xmlParserInput * xmlNewPushInput(const char *url, const char *chunk, int size) { xmlParserInputBufferPtr buf; xmlParserInputPtr input; @@ -2124,8 +2124,8 @@ xmlNewPushInput(const char *url, const char *chunk, int size) { * @param enc the charset encoding if known * @returns the new input stream or NULL */ -xmlParserInputPtr -xmlNewIOInputStream(xmlParserCtxtPtr ctxt, xmlParserInputBufferPtr buf, +xmlParserInput * +xmlNewIOInputStream(xmlParserCtxt *ctxt, xmlParserInputBuffer *buf, xmlCharEncoding enc) { xmlParserInputPtr input; const char *encoding; @@ -2155,8 +2155,8 @@ xmlNewIOInputStream(xmlParserCtxtPtr ctxt, xmlParserInputBufferPtr buf, * @param ent an Entity pointer * @returns the new input stream or NULL */ -xmlParserInputPtr -xmlNewEntityInputStream(xmlParserCtxtPtr ctxt, xmlEntityPtr ent) { +xmlParserInput * +xmlNewEntityInputStream(xmlParserCtxt *ctxt, xmlEntity *ent) { xmlParserInputPtr input; if ((ctxt == NULL) || (ent == NULL)) @@ -2196,8 +2196,8 @@ xmlNewEntityInputStream(xmlParserCtxtPtr ctxt, xmlEntityPtr ent) { * @param buffer an memory buffer * @returns the new input stream */ -xmlParserInputPtr -xmlNewStringInputStream(xmlParserCtxtPtr ctxt, const xmlChar *buffer) { +xmlParserInput * +xmlNewStringInputStream(xmlParserCtxt *ctxt, const xmlChar *buffer) { return(xmlCtxtNewInputFromString(ctxt, NULL, (const char *) buffer, NULL, 0)); } @@ -2303,9 +2303,9 @@ xmlResolveResourceFromCatalog(const char *URL, const char *ID, * @param ret an XML parser input * @returns NULL. */ -xmlParserInputPtr -xmlCheckHTTPInput(xmlParserCtxtPtr ctxt ATTRIBUTE_UNUSED, - xmlParserInputPtr ret ATTRIBUTE_UNUSED) { +xmlParserInput * +xmlCheckHTTPInput(xmlParserCtxt *ctxt ATTRIBUTE_UNUSED, + xmlParserInput *ret ATTRIBUTE_UNUSED) { return(NULL); } @@ -2336,7 +2336,7 @@ xmlCheckHTTPInput(xmlParserCtxtPtr ctxt ATTRIBUTE_UNUSED, */ xmlParserErrors xmlNewInputFromUrl(const char *filename, xmlParserInputFlags flags, - xmlParserInputPtr *out) { + xmlParserInput **out) { xmlParserInputBufferPtr buf; xmlParserInputPtr input; xmlParserErrors code = XML_ERR_OK; @@ -2376,8 +2376,8 @@ xmlNewInputFromUrl(const char *filename, xmlParserInputFlags flags, * @param filename the filename to use as entity * @returns the new input stream or NULL in case of error */ -xmlParserInputPtr -xmlNewInputFromFile(xmlParserCtxtPtr ctxt, const char *filename) { +xmlParserInput * +xmlNewInputFromFile(xmlParserCtxt *ctxt, const char *filename) { xmlParserInputPtr input; xmlParserInputFlags flags = 0; xmlParserErrors code; @@ -2453,9 +2453,9 @@ xmlDefaultExternalEntityLoader(const char *url, const char *ID, * @param ctxt the context in which the entity is called or NULL * @returns a new allocated xmlParserInputPtr, or NULL. */ -xmlParserInputPtr +xmlParserInput * xmlNoNetExternalEntityLoader(const char *URL, const char *ID, - xmlParserCtxtPtr ctxt) { + xmlParserCtxt *ctxt) { int oldOptions = 0; xmlParserInputPtr input; @@ -2514,7 +2514,7 @@ xmlGetExternalEntityLoader(void) { * @param vctxt user data */ void -xmlCtxtSetResourceLoader(xmlParserCtxtPtr ctxt, xmlResourceLoader loader, +xmlCtxtSetResourceLoader(xmlParserCtxt *ctxt, xmlResourceLoader loader, void *vctxt) { if (ctxt == NULL) return; @@ -2530,8 +2530,8 @@ xmlCtxtSetResourceLoader(xmlParserCtxtPtr ctxt, xmlResourceLoader loader, * @param type resource type * @returns the xmlParserInputPtr or NULL in case of error. */ -xmlParserInputPtr -xmlLoadResource(xmlParserCtxtPtr ctxt, const char *url, const char *publicId, +xmlParserInput * +xmlLoadResource(xmlParserCtxt *ctxt, const char *url, const char *publicId, xmlResourceType type) { char *canonicFilename; xmlParserInputPtr ret; @@ -2607,9 +2607,9 @@ xmlLoadResource(xmlParserCtxtPtr ctxt, const char *url, const char *publicId, * @param ctxt the context in which the entity is called or NULL * @returns the xmlParserInputPtr or NULL */ -xmlParserInputPtr +xmlParserInput * xmlLoadExternalEntity(const char *URL, const char *ID, - xmlParserCtxtPtr ctxt) { + xmlParserCtxt *ctxt) { return(xmlLoadResource(ctxt, URL, ID, XML_RESOURCE_UNKNOWN)); } @@ -2799,7 +2799,7 @@ xmlInitSAXParserCtxt(xmlParserCtxtPtr ctxt, const xmlSAXHandler *sax, */ int -xmlInitParserCtxt(xmlParserCtxtPtr ctxt) +xmlInitParserCtxt(xmlParserCtxt *ctxt) { return(xmlInitSAXParserCtxt(ctxt, NULL, NULL)); } @@ -2812,7 +2812,7 @@ xmlInitParserCtxt(xmlParserCtxtPtr ctxt) */ void -xmlFreeParserCtxt(xmlParserCtxtPtr ctxt) +xmlFreeParserCtxt(xmlParserCtxt *ctxt) { xmlParserInputPtr input; @@ -2897,7 +2897,7 @@ xmlFreeParserCtxt(xmlParserCtxtPtr ctxt) * @returns the xmlParserCtxtPtr or NULL */ -xmlParserCtxtPtr +xmlParserCtxt * xmlNewParserCtxt(void) { return(xmlNewSAXParserCtxt(NULL, NULL)); @@ -2918,7 +2918,7 @@ xmlNewParserCtxt(void) * @returns the xmlParserCtxtPtr or NULL if memory allocation failed. */ -xmlParserCtxtPtr +xmlParserCtxt * xmlNewSAXParserCtxt(const xmlSAXHandler *sax, void *userData) { xmlParserCtxtPtr ctxt; @@ -2943,7 +2943,7 @@ xmlNewSAXParserCtxt(const xmlSAXHandler *sax, void *userData) * @returns the private application data. */ void * -xmlCtxtGetPrivate(xmlParserCtxtPtr ctxt) { +xmlCtxtGetPrivate(xmlParserCtxt *ctxt) { if (ctxt == NULL) return(NULL); @@ -2959,7 +2959,7 @@ xmlCtxtGetPrivate(xmlParserCtxtPtr ctxt) { * @param priv private application data */ void -xmlCtxtSetPrivate(xmlParserCtxtPtr ctxt, void *priv) { +xmlCtxtSetPrivate(xmlParserCtxt *ctxt, void *priv) { if (ctxt == NULL) return; @@ -2973,7 +2973,7 @@ xmlCtxtSetPrivate(xmlParserCtxtPtr ctxt, void *priv) { * @returns the local catalogs. */ void * -xmlCtxtGetCatalogs(xmlParserCtxtPtr ctxt) { +xmlCtxtGetCatalogs(xmlParserCtxt *ctxt) { if (ctxt == NULL) return(NULL); @@ -2989,7 +2989,7 @@ xmlCtxtGetCatalogs(xmlParserCtxtPtr ctxt) { * @param catalogs catalogs pointer */ void -xmlCtxtSetCatalogs(xmlParserCtxtPtr ctxt, void *catalogs) { +xmlCtxtSetCatalogs(xmlParserCtxt *ctxt, void *catalogs) { if (ctxt == NULL) return; @@ -3002,8 +3002,8 @@ xmlCtxtSetCatalogs(xmlParserCtxtPtr ctxt, void *catalogs) { * @param ctxt parser context * @returns the dictionary. */ -xmlDictPtr -xmlCtxtGetDict(xmlParserCtxtPtr ctxt) { +xmlDict * +xmlCtxtGetDict(xmlParserCtxt *ctxt) { if (ctxt == NULL) return(NULL); @@ -3020,7 +3020,7 @@ xmlCtxtGetDict(xmlParserCtxtPtr ctxt) { * @param dict dictionary */ void -xmlCtxtSetDict(xmlParserCtxtPtr ctxt, xmlDictPtr dict) { +xmlCtxtSetDict(xmlParserCtxt *ctxt, xmlDict *dict) { if (ctxt == NULL) return; @@ -3039,7 +3039,7 @@ xmlCtxtSetDict(xmlParserCtxtPtr ctxt, xmlDictPtr dict) { * be freed. Handlers can be updated. */ xmlSAXHandler * -xmlCtxtGetSaxHandler(xmlParserCtxtPtr ctxt) { +xmlCtxtGetSaxHandler(xmlParserCtxt *ctxt) { if (ctxt == NULL) return(NULL); @@ -3057,7 +3057,7 @@ xmlCtxtGetSaxHandler(xmlParserCtxtPtr ctxt) { * allocation failed. */ int -xmlCtxtSetSaxHandler(xmlParserCtxtPtr ctxt, const xmlSAXHandler *sax) { +xmlCtxtSetSaxHandler(xmlParserCtxt *ctxt, const xmlSAXHandler *sax) { xmlSAXHandler *copy; if ((ctxt == NULL) || (sax == NULL)) @@ -3081,8 +3081,8 @@ xmlCtxtSetSaxHandler(xmlParserCtxtPtr ctxt, const xmlSAXHandler *sax) { * parsing. The document must be freed by the caller. Resets the * context's document to NULL. */ -xmlDocPtr -xmlCtxtGetDocument(xmlParserCtxtPtr ctxt) { +xmlDoc * +xmlCtxtGetDocument(xmlParserCtxt *ctxt) { xmlDocPtr doc; if (ctxt == NULL) @@ -3110,7 +3110,7 @@ xmlCtxtGetDocument(xmlParserCtxtPtr ctxt) { * @returns 1 if this is a HTML parser context, 0 otherwise. */ int -xmlCtxtIsHtml(xmlParserCtxtPtr ctxt) { +xmlCtxtIsHtml(xmlParserCtxt *ctxt) { if (ctxt == NULL) return(0); @@ -3124,7 +3124,7 @@ xmlCtxtIsHtml(xmlParserCtxtPtr ctxt) { * @returns 1 if the parser is stopped, 0 otherwise. */ int -xmlCtxtIsStopped(xmlParserCtxtPtr ctxt) { +xmlCtxtIsStopped(xmlParserCtxt *ctxt) { if (ctxt == NULL) return(0); @@ -3138,8 +3138,8 @@ xmlCtxtIsStopped(xmlParserCtxtPtr ctxt) { * @param ctxt parser context * @returns the validation context. */ -xmlValidCtxtPtr -xmlCtxtGetValidCtxt(xmlParserCtxtPtr ctxt) { +xmlValidCtxt * +xmlCtxtGetValidCtxt(xmlParserCtxt *ctxt) { if (ctxt == NULL) return(NULL); @@ -3161,7 +3161,7 @@ xmlCtxtGetValidCtxt(xmlParserCtxtPtr ctxt) { * @param ctxt an XML parser context */ void -xmlClearParserCtxt(xmlParserCtxtPtr ctxt) +xmlClearParserCtxt(xmlParserCtxt *ctxt) { xmlCtxtReset(ctxt); } @@ -3177,7 +3177,7 @@ xmlClearParserCtxt(xmlParserCtxtPtr ctxt) * @returns an xmlParserNodeInfo block pointer or NULL */ const xmlParserNodeInfo * -xmlParserFindNodeInfo(xmlParserCtxtPtr ctx, xmlNodePtr node) +xmlParserFindNodeInfo(xmlParserCtxt *ctx, xmlNode *node) { unsigned long pos; @@ -3201,7 +3201,7 @@ xmlParserFindNodeInfo(xmlParserCtxtPtr ctx, xmlNodePtr node) * @param seq a node info sequence pointer */ void -xmlInitNodeInfoSeq(xmlParserNodeInfoSeqPtr seq) +xmlInitNodeInfoSeq(xmlParserNodeInfoSeq *seq) { if (seq == NULL) return; @@ -3218,7 +3218,7 @@ xmlInitNodeInfoSeq(xmlParserNodeInfoSeqPtr seq) * @param seq a node info sequence pointer */ void -xmlClearNodeInfoSeq(xmlParserNodeInfoSeqPtr seq) +xmlClearNodeInfoSeq(xmlParserNodeInfoSeq *seq) { if (seq == NULL) return; @@ -3238,8 +3238,8 @@ xmlClearNodeInfoSeq(xmlParserNodeInfoSeqPtr seq) * @returns a long indicating the position of the record */ unsigned long -xmlParserFindNodeInfoIndex(xmlParserNodeInfoSeqPtr seq, - xmlNodePtr node) +xmlParserFindNodeInfoIndex(xmlParserNodeInfoSeq *seq, + xmlNode *node) { unsigned long upper, lower, middle; int found = 0; @@ -3278,8 +3278,8 @@ xmlParserFindNodeInfoIndex(xmlParserNodeInfoSeqPtr seq, * @param info a node info sequence pointer */ void -xmlParserAddNodeInfo(xmlParserCtxtPtr ctxt, - xmlParserNodeInfoPtr info) +xmlParserAddNodeInfo(xmlParserCtxt *ctxt, + xmlParserNodeInfo *info) { unsigned long pos; diff --git a/pattern.c b/pattern.c index 3077f986..6a22bcab 100644 --- a/pattern.c +++ b/pattern.c @@ -218,7 +218,7 @@ xmlNewPattern(void) { * @param comp an XSLT comp */ void -xmlFreePattern(xmlPatternPtr comp) { +xmlFreePattern(xmlPattern *comp) { xmlFreePatternList(comp); } @@ -258,7 +258,7 @@ xmlFreePatternInternal(xmlPatternPtr comp) { * @param comp an XSLT comp list */ void -xmlFreePatternList(xmlPatternPtr comp) { +xmlFreePatternList(xmlPattern *comp) { xmlPatternPtr cur; while (comp != NULL) { @@ -1564,7 +1564,7 @@ xmlNewStreamCtxt(xmlStreamCompPtr stream) { * @param stream the stream context */ void -xmlFreeStreamCtxt(xmlStreamCtxtPtr stream) { +xmlFreeStreamCtxt(xmlStreamCtxt *stream) { xmlStreamCtxtPtr next; while (stream != NULL) { @@ -1956,7 +1956,7 @@ stream_next: * match and 0 otherwise. */ int -xmlStreamPush(xmlStreamCtxtPtr stream, +xmlStreamPush(xmlStreamCtxt *stream, const xmlChar *name, const xmlChar *ns) { return (xmlStreamPushInternal(stream, name, ns, XML_ELEMENT_NODE)); } @@ -1979,7 +1979,7 @@ xmlStreamPush(xmlStreamCtxtPtr stream, * match and 0 otherwise. */ int -xmlStreamPushNode(xmlStreamCtxtPtr stream, +xmlStreamPushNode(xmlStreamCtxt *stream, const xmlChar *name, const xmlChar *ns, int nodeType) { @@ -2005,7 +2005,7 @@ xmlStreamPushNode(xmlStreamCtxtPtr stream, * is a match and 0 otherwise. */ int -xmlStreamPushAttr(xmlStreamCtxtPtr stream, +xmlStreamPushAttr(xmlStreamCtxt *stream, const xmlChar *name, const xmlChar *ns) { return (xmlStreamPushInternal(stream, name, ns, XML_ATTRIBUTE_NODE)); } @@ -2017,7 +2017,7 @@ xmlStreamPushAttr(xmlStreamCtxtPtr stream, * @returns -1 in case of error, 0 otherwise. */ int -xmlStreamPop(xmlStreamCtxtPtr stream) { +xmlStreamPop(xmlStreamCtxt *stream) { int i, lev; if (stream == NULL) @@ -2063,7 +2063,7 @@ xmlStreamPop(xmlStreamCtxtPtr stream) { * 0 otherwise. -1 on API errors. */ int -xmlStreamWantsAnyNode(xmlStreamCtxtPtr streamCtxt) +xmlStreamWantsAnyNode(xmlStreamCtxt *streamCtxt) { if (streamCtxt == NULL) return(-1); @@ -2095,7 +2095,7 @@ xmlStreamWantsAnyNode(xmlStreamCtxtPtr streamCtxt) */ int xmlPatternCompileSafe(const xmlChar *pattern, xmlDict *dict, int flags, - const xmlChar **namespaces, xmlPatternPtr *patternOut) { + const xmlChar **namespaces, xmlPattern **patternOut) { xmlPatternPtr ret = NULL, cur; xmlPatParserContextPtr ctxt = NULL; const xmlChar *or, *start; @@ -2218,7 +2218,7 @@ error: * @param namespaces the prefix definitions, array of [URI, prefix] or NULL * @returns the compiled form of the pattern or NULL in case of error */ -xmlPatternPtr +xmlPattern * xmlPatterncompile(const xmlChar *pattern, xmlDict *dict, int flags, const xmlChar **namespaces) { xmlPatternPtr ret; @@ -2234,7 +2234,7 @@ xmlPatterncompile(const xmlChar *pattern, xmlDict *dict, int flags, * @returns 1 if it matches, 0 if it doesn't and -1 in case of failure */ int -xmlPatternMatch(xmlPatternPtr comp, xmlNodePtr node) +xmlPatternMatch(xmlPattern *comp, xmlNode *node) { int ret = 0; @@ -2257,8 +2257,8 @@ xmlPatternMatch(xmlPatternPtr comp, xmlNodePtr node) * @param comp the precompiled pattern * @returns a pointer to the context or NULL in case of failure */ -xmlStreamCtxtPtr -xmlPatternGetStreamCtxt(xmlPatternPtr comp) +xmlStreamCtxt * +xmlPatternGetStreamCtxt(xmlPattern *comp) { xmlStreamCtxtPtr ret = NULL, cur; @@ -2294,7 +2294,7 @@ failed: * @returns 1 if streamable, 0 if not and -1 in case of error. */ int -xmlPatternStreamable(xmlPatternPtr comp) { +xmlPatternStreamable(xmlPattern *comp) { if (comp == NULL) return(-1); while (comp != NULL) { @@ -2313,7 +2313,7 @@ xmlPatternStreamable(xmlPatternPtr comp) { * and -1 in case of error */ int -xmlPatternMaxDepth(xmlPatternPtr comp) { +xmlPatternMaxDepth(xmlPattern *comp) { int ret = 0, i; if (comp == NULL) return(-1); @@ -2338,7 +2338,7 @@ xmlPatternMaxDepth(xmlPatternPtr comp) { * @returns -1 in case of error otherwise the depth, */ int -xmlPatternMinDepth(xmlPatternPtr comp) { +xmlPatternMinDepth(xmlPattern *comp) { int ret = 12345678; if (comp == NULL) return(-1); @@ -2361,7 +2361,7 @@ xmlPatternMinDepth(xmlPatternPtr comp) { * @returns 1 if true, 0 if false and -1 in case of error */ int -xmlPatternFromRoot(xmlPatternPtr comp) { +xmlPatternFromRoot(xmlPattern *comp) { if (comp == NULL) return(-1); while (comp != NULL) { diff --git a/python/generator.py b/python/generator.py index 040ab7ad..63c48446 100755 --- a/python/generator.py +++ b/python/generator.py @@ -7,26 +7,26 @@ functions = { 'xmlRegisterXPathFunction': ( 'Register a Python written function to the XPath interpreter', ['int', '1 in case of success, 0 or -1 in case of error', None], - [['ctx', 'xmlXPathContextPtr', 'the xpathContext'], ['name', 'xmlChar *', 'the function name'], ['ns_uri', 'xmlChar *', 'the namespace or NULL'], ['f', 'pythonObject', 'the python function']], + [['ctx', 'xmlXPathContext *', 'the xpathContext'], ['name', 'xmlChar *', 'the function name'], ['ns_uri', 'xmlChar *', 'the namespace or NULL'], ['f', 'pythonObject', 'the python function']], 'python', 'defined(LIBXML_XPATH_ENABLED)'), 'xmlXPathRegisterVariable': ( 'Register a variable with the XPath context', ['int', '1 in case of success, 0 or -1 in case of error', None], - [['ctx', 'xmlXPathContextPtr', 'the xpathContext'], ['name', 'xmlChar *', 'the variable name'], ['ns_uri', 'xmlChar *', 'the namespace or NULL'], ['value', 'pythonObject', 'the value']], + [['ctx', 'xmlXPathContext *', 'the xpathContext'], ['name', 'xmlChar *', 'the variable name'], ['ns_uri', 'xmlChar *', 'the namespace or NULL'], ['value', 'pythonObject', 'the value']], 'python', 'defined(LIBXML_XPATH_ENABLED)'), 'xmlNewNode': ( 'Create a new Node', - ['xmlNodePtr', 'A new element node', None], + ['xmlNode *', 'A new element node', None], [['name', 'xmlChar *', 'the node name']], 'python', None), 'xmlCreatePushParser': ( 'Create a progressive XML parser context to build either an event flow if the SAX object is not None, or a DOM tree otherwise.', - ['xmlParserCtxtPtr', 'the parser context or None in case of error', None], + ['xmlParserCtxt *', 'the parser context or None in case of error', None], [['SAX', 'pythonObject', 'the SAX callback object or None'], ['chunk', 'xmlChar *', 'the initial data'], ['size', 'int', 'the size of the initial data'], ['URI', 'xmlChar *', 'The URI used for base computations']], 'python', None), 'htmlCreatePushParser': ( 'Create a progressive HTML parser context to build either an event flow if the SAX object is not None, or a DOM tree otherwise.', - ['xmlParserCtxtPtr', 'the parser context or None in case of error', None], + ['xmlParserCtxt *', 'the parser context or None in case of error', None], [['SAX', 'pythonObject', 'the SAX callback object or None'], ['chunk', 'xmlChar *', 'the initial data'], ['size', 'int', 'the size of the initial data'], ['URI', 'xmlChar *', 'The URI used for base computations']], 'python', 'defined(LIBXML_HTML_ENABLED)'), 'xmlSAXParseFile': ( @@ -41,12 +41,12 @@ functions = { 'python', 'defined(LIBXML_HTML_ENABLED)'), 'xmlCreateOutputBuffer': ( 'Create a libxml2 output buffer from a Python file', - ['xmlOutputBufferPtr', 'the output buffer', None], + ['xmlOutputBuffer *', 'the output buffer', None], [['file', 'pythonObject', 'the Python file'], ['encoding', 'xmlChar *', 'an optional encoding']], 'python', None), 'xmlCreateInputBuffer': ( 'Create a libxml2 input buffer from a Python file', - ['xmlParserInputBufferPtr', 'the input buffer', None], + ['xmlParserInputBuffer *', 'the input buffer', None], [['file', 'pythonObject', 'the Python file'], ['encoding', 'xmlChar *', 'an optional encoding']], 'python', None), 'xmlSetEntityLoader': ( @@ -56,43 +56,43 @@ functions = { 'python', None), 'xmlParserGetDoc': ( 'Get the document tree from a parser context.', - ['xmlDocPtr', 'the document tree', 'myDoc'], - [['ctxt', 'xmlParserCtxtPtr', 'the parser context']], + ['xmlDoc *', 'the document tree', 'myDoc'], + [['ctxt', 'xmlParserCtxt *', 'the parser context']], 'python_accessor', None), 'xmlParserGetWellFormed': ( 'Get the well formed information from a parser context.', ['int', 'the wellFormed field', 'wellFormed'], - [['ctxt', 'xmlParserCtxtPtr', 'the parser context']], + [['ctxt', 'xmlParserCtxt *', 'the parser context']], 'python_accessor', None), 'xmlParserGetIsValid': ( 'Get the validity information from a parser context.', ['int', 'the valid field', 'valid'], - [['ctxt', 'xmlParserCtxtPtr', 'the parser context']], + [['ctxt', 'xmlParserCtxt *', 'the parser context']], 'python_accessor', None), 'xmlParserSetValidate': ( 'Switch the parser to validation mode.', ['void', None, None], - [['ctxt', 'xmlParserCtxtPtr', 'the parser context'], ['validate', 'int', '1 to activate validation']], + [['ctxt', 'xmlParserCtxt *', 'the parser context'], ['validate', 'int', '1 to activate validation']], 'python_accessor', None), 'xmlParserSetReplaceEntities': ( 'Switch the parser to replace entities.', ['void', None, None], - [['ctxt', 'xmlParserCtxtPtr', 'the parser context'], ['replaceEntities', 'int', '1 to replace entities']], + [['ctxt', 'xmlParserCtxt *', 'the parser context'], ['replaceEntities', 'int', '1 to replace entities']], 'python_accessor', None), 'xmlParserSetPedantic': ( 'Switch the parser to be pedantic.', ['void', None, None], - [['ctxt', 'xmlParserCtxtPtr', 'the parser context'], ['pedantic', 'int', '1 to run in pedantic mode']], + [['ctxt', 'xmlParserCtxt *', 'the parser context'], ['pedantic', 'int', '1 to run in pedantic mode']], 'python_accessor', None), 'xmlParserSetLoadSubset': ( 'Switch the parser to load the DTD without validating.', ['void', None, None], - [['ctxt', 'xmlParserCtxtPtr', 'the parser context'], ['loadsubset', 'int', '1 to load the DTD']], + [['ctxt', 'xmlParserCtxt *', 'the parser context'], ['loadsubset', 'int', '1 to load the DTD']], 'python_accessor', None), 'xmlParserSetLineNumbers': ( 'Switch on the generation of line number for elements nodes.', ['void', None, None], - [['ctxt', 'xmlParserCtxtPtr', 'the parser context'], ['linenumbers', 'int', '1 to save line numbers']], + [['ctxt', 'xmlParserCtxt *', 'the parser context'], ['linenumbers', 'int', '1 to save line numbers']], 'python_accessor', None), 'xmlDebugMemory': ( 'Switch on the generation of line number for elements nodes. Also returns the number of bytes allocated and not freed by libxml2 since memory debugging was switched on.', @@ -101,188 +101,188 @@ functions = { 'python', None), 'xmlNodeGetNs': ( 'Get the namespace of a node', - ['xmlNsPtr', 'The namespace or None', None], - [['node', 'xmlNodePtr', 'the node']], + ['xmlNs *', 'The namespace or None', None], + [['node', 'xmlNode *', 'the node']], 'python_accessor', None), 'xmlNodeGetNsDefs': ( 'Get the namespace of a node', - ['xmlNsPtr', 'The namespace or None', None], - [['node', 'xmlNodePtr', 'the node']], + ['xmlNs *', 'The namespace or None', None], + [['node', 'xmlNode *', 'the node']], 'python_accessor', None), 'xmlXPathParserGetContext': ( 'Get the xpathContext from an xpathParserContext', - ['xmlXPathContextPtr', 'The XPath context', 'context'], - [['ctxt', 'xmlXPathParserContextPtr', 'the XPath parser context']], + ['xmlXPathContext *', 'The XPath context', 'context'], + [['ctxt', 'xmlXPathParserContext *', 'the XPath parser context']], 'python_accessor', 'defined(LIBXML_XPATH_ENABLED)'), 'xmlXPathGetContextDoc': ( 'Get the doc from an xpathContext', - ['xmlDocPtr', 'The doc context', 'doc'], - [['ctxt', 'xmlXPathContextPtr', 'the XPath context']], + ['xmlDoc *', 'The doc context', 'doc'], + [['ctxt', 'xmlXPathContext *', 'the XPath context']], 'python_accessor', 'defined(LIBXML_XPATH_ENABLED)'), 'xmlXPathGetContextNode': ( 'Get the current node from an xpathContext', - ['xmlNodePtr', 'The node context', 'node'], - [['ctxt', 'xmlXPathContextPtr', 'the XPath context']], + ['xmlNode *', 'The node context', 'node'], + [['ctxt', 'xmlXPathContext *', 'the XPath context']], 'python_accessor', 'defined(LIBXML_XPATH_ENABLED)'), 'xmlXPathSetContextDoc': ( 'Set the doc of an xpathContext', ['void', None, None], - [['ctxt', 'xmlXPathContextPtr', 'the XPath context'], ['doc', 'xmlDocPtr', 'The doc context']], + [['ctxt', 'xmlXPathContext *', 'the XPath context'], ['doc', 'xmlDoc *', 'The doc context']], 'python_accessor', 'defined(LIBXML_XPATH_ENABLED)'), 'xmlXPathSetContextNode': ( 'Set the current node of an xpathContext', ['void', None, None], - [['ctxt', 'xmlXPathContextPtr', 'the XPath context'], ['node', 'xmlNodePtr', 'The node context']], + [['ctxt', 'xmlXPathContext *', 'the XPath context'], ['node', 'xmlNode *', 'The node context']], 'python_accessor', 'defined(LIBXML_XPATH_ENABLED)'), 'xmlXPathGetContextPosition': ( 'Get the current node from an xpathContext', ['int', 'The node context', 'proximityPosition'], - [['ctxt', 'xmlXPathContextPtr', 'the XPath context']], + [['ctxt', 'xmlXPathContext *', 'the XPath context']], 'python_accessor', 'defined(LIBXML_XPATH_ENABLED)'), 'xmlXPathGetContextSize': ( 'Get the current node from an xpathContext', ['int', 'The node context', 'contextSize'], - [['ctxt', 'xmlXPathContextPtr', 'the XPath context']], + [['ctxt', 'xmlXPathContext *', 'the XPath context']], 'python_accessor', 'defined(LIBXML_XPATH_ENABLED)'), 'xmlXPathGetFunction': ( 'Get the current function name xpathContext', ['const xmlChar *', 'The function name', 'function'], - [['ctxt', 'xmlXPathContextPtr', 'the XPath context']], + [['ctxt', 'xmlXPathContext *', 'the XPath context']], 'python_accessor', 'defined(LIBXML_XPATH_ENABLED)'), 'xmlXPathGetFunctionURI': ( 'Get the current function name URI xpathContext', ['const xmlChar *', 'The function name URI', 'functionURI'], - [['ctxt', 'xmlXPathContextPtr', 'the XPath context']], + [['ctxt', 'xmlXPathContext *', 'the XPath context']], 'python_accessor', 'defined(LIBXML_XPATH_ENABLED)'), 'xmlURIGetScheme': ( 'Get the scheme part from an URI', ['const char *', 'The URI scheme', 'scheme'], - [['URI', 'xmlURIPtr', 'the URI']], + [['URI', 'xmlURI *', 'the URI']], 'python_accessor', None), 'xmlURISetScheme': ( 'Set the scheme part of an URI.', ['void', None, None], - [['URI', 'xmlURIPtr', 'the URI'], ['scheme', 'char *', 'The URI scheme part']], + [['URI', 'xmlURI *', 'the URI'], ['scheme', 'char *', 'The URI scheme part']], 'python_accessor', None), 'xmlURIGetOpaque': ( 'Get the opaque part from an URI', ['const char *', 'The URI opaque', 'opaque'], - [['URI', 'xmlURIPtr', 'the URI']], + [['URI', 'xmlURI *', 'the URI']], 'python_accessor', None), 'xmlURISetOpaque': ( 'Set the opaque part of an URI.', ['void', None, None], - [['URI', 'xmlURIPtr', 'the URI'], ['opaque', 'char *', 'The URI opaque part']], + [['URI', 'xmlURI *', 'the URI'], ['opaque', 'char *', 'The URI opaque part']], 'python_accessor', None), 'xmlURIGetAuthority': ( 'Get the authority part from an URI', ['const char *', 'The URI authority', 'authority'], - [['URI', 'xmlURIPtr', 'the URI']], + [['URI', 'xmlURI *', 'the URI']], 'python_accessor', None), 'xmlURISetAuthority': ( 'Set the authority part of an URI.', ['void', None, None], - [['URI', 'xmlURIPtr', 'the URI'], ['authority', 'char *', 'The URI authority part']], + [['URI', 'xmlURI *', 'the URI'], ['authority', 'char *', 'The URI authority part']], 'python_accessor', None), 'xmlURIGetServer': ( 'Get the server part from an URI', ['const char *', 'The URI server', 'server'], - [['URI', 'xmlURIPtr', 'the URI']], + [['URI', 'xmlURI *', 'the URI']], 'python_accessor', None), 'xmlURISetServer': ( 'Set the server part of an URI.', ['void', None, None], - [['URI', 'xmlURIPtr', 'the URI'], ['server', 'char *', 'The URI server part']], + [['URI', 'xmlURI *', 'the URI'], ['server', 'char *', 'The URI server part']], 'python_accessor', None), 'xmlURIGetUser': ( 'Get the user part from an URI', ['const char *', 'The URI user', 'user'], - [['URI', 'xmlURIPtr', 'the URI']], + [['URI', 'xmlURI *', 'the URI']], 'python_accessor', None), 'xmlURISetUser': ( 'Set the user part of an URI.', ['void', None, None], - [['URI', 'xmlURIPtr', 'the URI'], ['user', 'char *', 'The URI user part']], + [['URI', 'xmlURI *', 'the URI'], ['user', 'char *', 'The URI user part']], 'python_accessor', None), 'xmlURIGetPath': ( 'Get the path part from an URI', ['const char *', 'The URI path', 'path'], - [['URI', 'xmlURIPtr', 'the URI']], + [['URI', 'xmlURI *', 'the URI']], 'python_accessor', None), 'xmlURISetPath': ( 'Set the path part of an URI.', ['void', None, None], - [['URI', 'xmlURIPtr', 'the URI'], ['path', 'char *', 'The URI path part']], + [['URI', 'xmlURI *', 'the URI'], ['path', 'char *', 'The URI path part']], 'python_accessor', None), 'xmlURIGetQuery': ( 'Get the query part from an URI', ['const char *', 'The URI query', 'query'], - [['URI', 'xmlURIPtr', 'the URI']], + [['URI', 'xmlURI *', 'the URI']], 'python_accessor', None), 'xmlURISetQuery': ( 'Set the query part of an URI.', ['void', None, None], - [['URI', 'xmlURIPtr', 'the URI'], ['query', 'char *', 'The URI query part']], + [['URI', 'xmlURI *', 'the URI'], ['query', 'char *', 'The URI query part']], 'python_accessor', None), 'xmlURIGetQueryRaw': ( 'Get the raw query part from an URI (i.e. the unescaped form).', ['const char *', 'The URI query', 'query_raw'], - [['URI', 'xmlURIPtr', 'the URI']], + [['URI', 'xmlURI *', 'the URI']], 'python_accessor', None), 'xmlURISetQueryRaw': ( 'Set the raw query part of an URI (i.e. the unescaped form).', ['void', None, None], - [['URI', 'xmlURIPtr', 'the URI'], ['query_raw', 'char *', 'The raw URI query part']], + [['URI', 'xmlURI *', 'the URI'], ['query_raw', 'char *', 'The raw URI query part']], 'python_accessor', None), 'xmlURIGetFragment': ( 'Get the fragment part from an URI', ['const char *', 'The URI fragment', 'fragment'], - [['URI', 'xmlURIPtr', 'the URI']], + [['URI', 'xmlURI *', 'the URI']], 'python_accessor', None), 'xmlURISetFragment': ( 'Set the fragment part of an URI.', ['void', None, None], - [['URI', 'xmlURIPtr', 'the URI'], ['fragment', 'char *', 'The URI fragment part']], + [['URI', 'xmlURI *', 'the URI'], ['fragment', 'char *', 'The URI fragment part']], 'python_accessor', None), 'xmlURIGetPort': ( 'Get the port part from an URI', ['int', 'The URI port', 'port'], - [['URI', 'xmlURIPtr', 'the URI']], + [['URI', 'xmlURI *', 'the URI']], 'python_accessor', None), 'xmlURISetPort': ( 'Set the port part of an URI.', ['void', None, None], - [['URI', 'xmlURIPtr', 'the URI'], ['port', 'int', 'The URI port part']], + [['URI', 'xmlURI *', 'the URI'], ['port', 'int', 'The URI port part']], 'python_accessor', None), 'xmlErrorGetDomain': ( 'What part of the library raised this error', ['int', 'The error domain', 'domain'], - [['Error', 'xmlErrorPtr', 'the Error']], + [['Error', 'xmlError *', 'the Error']], 'python_accessor', None), 'xmlErrorGetCode': ( 'The error code, e.g. an xmlParserError', ['int', 'The error code', 'code'], - [['Error', 'xmlErrorPtr', 'the Error']], + [['Error', 'xmlError *', 'the Error']], 'python_accessor', None), 'xmlErrorGetMessage': ( 'human-readable informative error message', ['const char *', 'The error message', 'message'], - [['Error', 'xmlErrorPtr', 'the Error']], + [['Error', 'xmlError *', 'the Error']], 'python_accessor', None), 'xmlErrorGetLevel': ( 'how consequent is the error', ['int', 'The error level', 'level'], - [['Error', 'xmlErrorPtr', 'the Error']], + [['Error', 'xmlError *', 'the Error']], 'python_accessor', None), 'xmlErrorGetFile': ( 'the filename', ['const char *', 'The error file', 'file'], - [['Error', 'xmlErrorPtr', 'the Error']], + [['Error', 'xmlError *', 'the Error']], 'python_accessor', None), 'xmlErrorGetLine': ( 'the line number if available', ['int', 'The error line', 'line'], - [['Error', 'xmlErrorPtr', 'the Error']], + [['Error', 'xmlError *', 'the Error']], 'python_accessor', None), 'xmlPythonCleanupParser': ( "Cleanup function for the XML library. It tries to reclaim all parsing related global memory allocated for the library processing. It doesn't deallocate any document related memory. Calling this function should not prevent reusing the library but one should call xmlCleanupParser() only when the process has finished using the library or XML document built with it.", @@ -331,13 +331,13 @@ skipped_modules = { } skipped_types = { 'int *': "usually a return type", - 'xmlSAXHandlerPtr': "not the proper interface for SAX", - 'htmlSAXHandlerPtr': "not the proper interface for SAX", - 'xmlRMutexPtr': "thread specific, skipped", - 'xmlMutexPtr': "thread specific, skipped", - 'xmlGlobalStatePtr': "thread specific, skipped", - 'xmlListPtr': "internal representation not suitable for python", - 'xmlBufferPtr': "internal representation not suitable for python", + 'xmlSAXHandler *': "not the proper interface for SAX", + 'htmlSAXHandler *': "not the proper interface for SAX", + 'xmlRMutex *': "thread specific, skipped", + 'xmlMutex *': "thread specific, skipped", + 'xmlGlobalState *': "thread specific, skipped", + 'xmlList *': "internal representation not suitable for python", + 'xmlBuffer *': "internal representation not suitable for python", 'FILE *': None, } @@ -486,74 +486,51 @@ py_types = { 'const char *': ('z', None, "charPtrConst", "const char *"), 'xmlChar *': ('z', None, "xmlCharPtr", "xmlChar *"), 'const xmlChar *': ('z', None, "xmlCharPtrConst", "const xmlChar *"), - 'xmlNodePtr': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'const xmlNodePtr': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'xmlNode *': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'const xmlNode *': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'xmlDtdPtr': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'const xmlDtdPtr': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'xmlDtd *': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'const xmlDtd *': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'xmlAttrPtr': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'const xmlAttrPtr': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'xmlAttr *': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'const xmlAttr *': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'xmlEntityPtr': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'const xmlEntityPtr': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'xmlEntity *': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'const xmlEntity *': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'xmlElementPtr': ('O', "xmlElement", "xmlElementPtr", "xmlElementPtr"), - 'const xmlElementPtr': ('O', "xmlElement", "xmlElementPtr", "xmlElementPtr"), - 'xmlElement *': ('O', "xmlElement", "xmlElementPtr", "xmlElementPtr"), - 'const xmlElement *': ('O', "xmlElement", "xmlElementPtr", "xmlElementPtr"), - 'xmlAttributePtr': ('O', "xmlAttribute", "xmlAttributePtr", "xmlAttributePtr"), - 'const xmlAttributePtr': ('O', "xmlAttribute", "xmlAttributePtr", "xmlAttributePtr"), - 'xmlAttribute *': ('O', "xmlAttribute", "xmlAttributePtr", "xmlAttributePtr"), - 'const xmlAttribute *': ('O', "xmlAttribute", "xmlAttributePtr", "xmlAttributePtr"), - 'xmlNsPtr': ('O', "xmlNode", "xmlNsPtr", "xmlNsPtr"), - 'const xmlNsPtr': ('O', "xmlNode", "xmlNsPtr", "xmlNsPtr"), - 'xmlNs *': ('O', "xmlNode", "xmlNsPtr", "xmlNsPtr"), - 'const xmlNs *': ('O', "xmlNode", "xmlNsPtr", "xmlNsPtr"), - 'xmlDocPtr': ('O', "xmlNode", "xmlDocPtr", "xmlDocPtr"), - 'const xmlDocPtr': ('O', "xmlNode", "xmlDocPtr", "xmlDocPtr"), - 'xmlDoc *': ('O', "xmlNode", "xmlDocPtr", "xmlDocPtr"), - 'const xmlDoc *': ('O', "xmlNode", "xmlDocPtr", "xmlDocPtr"), - 'htmlDocPtr': ('O', "xmlNode", "xmlDocPtr", "xmlDocPtr"), - 'const htmlDocPtr': ('O', "xmlNode", "xmlDocPtr", "xmlDocPtr"), - 'htmlDoc *': ('O', "xmlNode", "xmlDocPtr", "xmlDocPtr"), - 'const htmlDoc *': ('O', "xmlNode", "xmlDocPtr", "xmlDocPtr"), - 'htmlNodePtr': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'const htmlNodePtr': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'htmlNode *': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'const htmlNode *': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr"), - 'xmlXPathContextPtr': ('O', "xmlXPathContext", "xmlXPathContextPtr", "xmlXPathContextPtr"), - 'xmlXPathContext *': ('O', "xpathContext", "xmlXPathContextPtr", "xmlXPathContextPtr"), - 'xmlXPathParserContextPtr': ('O', "xmlXPathParserContext", "xmlXPathParserContextPtr", "xmlXPathParserContextPtr"), - 'xmlParserCtxtPtr': ('O', "parserCtxt", "xmlParserCtxtPtr", "xmlParserCtxtPtr"), - 'xmlParserCtxt *': ('O', "parserCtxt", "xmlParserCtxtPtr", "xmlParserCtxtPtr"), - 'htmlParserCtxtPtr': ('O', "parserCtxt", "xmlParserCtxtPtr", "xmlParserCtxtPtr"), - 'htmlParserCtxt *': ('O', "parserCtxt", "xmlParserCtxtPtr", "xmlParserCtxtPtr"), - 'xmlValidCtxtPtr': ('O', "ValidCtxt", "xmlValidCtxtPtr", "xmlValidCtxtPtr"), - 'xmlCatalogPtr': ('O', "catalog", "xmlCatalogPtr", "xmlCatalogPtr"), + 'xmlNode *': ('O', "xmlNode", "xmlNodePtr", "xmlNode *"), + 'const xmlNode *': ('O', "xmlNode", "xmlNodePtr", "xmlNode *"), + 'xmlDtd *': ('O', "xmlNode", "xmlNodePtr", "xmlNode *"), + 'const xmlDtd *': ('O', "xmlNode", "xmlNodePtr", "xmlNode *"), + 'xmlAttr *': ('O', "xmlNode", "xmlNodePtr", "xmlNode *"), + 'const xmlAttr *': ('O', "xmlNode", "xmlNodePtr", "xmlNode *"), + 'xmlEntity *': ('O', "xmlNode", "xmlNodePtr", "xmlNode *"), + 'const xmlEntity *': ('O', "xmlNode", "xmlNodePtr", "xmlNode *"), + 'xmlElement *': ('O', "xmlElement", "xmlElementPtr", "xmlElement *"), + 'const xmlElement *': ('O', "xmlElement", "xmlElementPtr", "xmlElement *"), + 'xmlAttribute *': ('O', "xmlAttribute", "xmlAttributePtr", "xmlAttribute *"), + 'const xmlAttribute *': ('O', "xmlAttribute", "xmlAttributePtr", "xmlAttribute *"), + 'xmlNs *': ('O', "xmlNode", "xmlNsPtr", "xmlNs *"), + 'const xmlNs *': ('O', "xmlNode", "xmlNsPtr", "xmlNs *"), + 'xmlDoc *': ('O', "xmlNode", "xmlDocPtr", "xmlDoc *"), + 'const xmlDoc *': ('O', "xmlNode", "xmlDocPtr", "xmlDoc *"), + 'htmlDoc *': ('O', "xmlNode", "xmlDocPtr", "xmlDoc *"), + 'const htmlDoc *': ('O', "xmlNode", "xmlDocPtr", "xmlDoc *"), + 'htmlNode *': ('O', "xmlNode", "xmlNodePtr", "xmlNode *"), + 'const htmlNode *': ('O', "xmlNode", "xmlNodePtr", "xmlNode *"), + 'xmlXPathContext *': ('O', "xmlXPathContext", "xmlXPathContextPtr", "xmlXPathContext *"), + 'xmlXPathParserContext *': ('O', "xmlXPathParserContext", "xmlXPathParserContextPtr", "xmlXPathParserContext *"), + 'xmlParserCtxt *': ('O', "parserCtxt", "xmlParserCtxtPtr", "xmlParserCtxt *"), + 'htmlParserCtxt *': ('O', "parserCtxt", "xmlParserCtxtPtr", "xmlParserCtxt *"), + 'xmlValidCtxt *': ('O', "ValidCtxt", "xmlValidCtxtPtr", "xmlValidCtxt *"), + 'xmlCatalog *': ('O', "catalog", "xmlCatalogPtr", "xmlCatalog *"), 'FILE *': ('O', "File", "FILEPtr", "FILE *"), - 'xmlURIPtr': ('O', "URI", "xmlURIPtr", "xmlURIPtr"), + 'xmlURI *': ('O', "URI", "xmlURIPtr", "xmlURI *"), 'const xmlError *': ('O', "Error", "xmlErrorPtr", "const xmlError *"), - 'xmlErrorPtr': ('O', "Error", "xmlErrorPtr", "xmlErrorPtr"), - 'xmlOutputBufferPtr': ('O', "outputBuffer", "xmlOutputBufferPtr", "xmlOutputBufferPtr"), - 'xmlParserInputBufferPtr': ('O', "inputBuffer", "xmlParserInputBufferPtr", "xmlParserInputBufferPtr"), - 'xmlRegexpPtr': ('O', "xmlReg", "xmlRegexpPtr", "xmlRegexpPtr"), + 'xmlError *': ('O', "Error", "xmlErrorPtr", "xmlError *"), + 'xmlOutputBuffer *': ('O', "outputBuffer", "xmlOutputBufferPtr", "xmlOutputBuffer *"), + 'xmlParserInputBuffer *': ('O', "inputBuffer", "xmlParserInputBufferPtr", "xmlParserInputBuffer *"), + 'xmlRegexp *': ('O', "xmlReg", "xmlRegexpPtr", "xmlRegexp *"), 'xmlTextReaderLocatorPtr': ('O', "xmlTextReaderLocator", "xmlTextReaderLocatorPtr", "xmlTextReaderLocatorPtr"), - 'xmlTextReaderPtr': ('O', "xmlTextReader", "xmlTextReaderPtr", "xmlTextReaderPtr"), - 'xmlRelaxNGPtr': ('O', "relaxNgSchema", "xmlRelaxNGPtr", "xmlRelaxNGPtr"), - 'xmlRelaxNGParserCtxtPtr': ('O', "relaxNgParserCtxt", "xmlRelaxNGParserCtxtPtr", "xmlRelaxNGParserCtxtPtr"), - 'xmlRelaxNGValidCtxtPtr': ('O', "relaxNgValidCtxt", "xmlRelaxNGValidCtxtPtr", "xmlRelaxNGValidCtxtPtr"), - 'xmlSchemaPtr': ('O', "Schema", "xmlSchemaPtr", "xmlSchemaPtr"), - 'xmlSchemaParserCtxtPtr': ('O', "SchemaParserCtxt", "xmlSchemaParserCtxtPtr", "xmlSchemaParserCtxtPtr"), - 'xmlSchemaValidCtxtPtr': ('O', "SchemaValidCtxt", "xmlSchemaValidCtxtPtr", "xmlSchemaValidCtxtPtr"), + 'xmlTextReader *': ('O', "xmlTextReader", "xmlTextReaderPtr", "xmlTextReader *"), + 'xmlRelaxNG *': ('O', "relaxNgSchema", "xmlRelaxNGPtr", "xmlRelaxNG *"), + 'xmlRelaxNGParserCtxt *': ('O', "relaxNgParserCtxt", "xmlRelaxNGParserCtxtPtr", "xmlRelaxNGParserCtxt *"), + 'xmlRelaxNGValidCtxt *': ('O', "relaxNgValidCtxt", "xmlRelaxNGValidCtxtPtr", "xmlRelaxNGValidCtxt *"), + 'xmlSchema *': ('O', "Schema", "xmlSchemaPtr", "xmlSchema *"), + 'xmlSchemaParserCtxt *': ('O', "SchemaParserCtxt", "xmlSchemaParserCtxtPtr", "xmlSchemaParserCtxt *"), + 'xmlSchemaValidCtxt *': ('O', "SchemaValidCtxt", "xmlSchemaValidCtxtPtr", "xmlSchemaValidCtxt *"), } py_return_types = { - 'xmlXPathObjectPtr': ('O', "foo", "xmlXPathObjectPtr", "xmlXPathObjectPtr"), + 'xmlXPathObject *': ('O', "foo", "xmlXPathObjectPtr", "xmlXPathObject *"), } unknown_types = {} @@ -1018,52 +995,40 @@ def buildStubs(): # The type automatically remapped to generated classes # classes_type = { - "xmlNodePtr": ("._o", "xmlNode(_obj=%s)", "xmlNode"), "xmlNode *": ("._o", "xmlNode(_obj=%s)", "xmlNode"), - "xmlDocPtr": ("._o", "xmlDoc(_obj=%s)", "xmlDoc"), "xmlDoc *": ("._o", "xmlDoc(_obj=%s)", "xmlDoc"), - "htmlDocPtr": ("._o", "xmlDoc(_obj=%s)", "xmlDoc"), - "htmlxmlDocPtr *": ("._o", "xmlDoc(_obj=%s)", "xmlDoc"), - "xmlAttrPtr": ("._o", "xmlAttr(_obj=%s)", "xmlAttr"), + "htmlDoc *": ("._o", "xmlDoc(_obj=%s)", "xmlDoc"), + "htmlxmlDoc * *": ("._o", "xmlDoc(_obj=%s)", "xmlDoc"), "xmlAttr *": ("._o", "xmlAttr(_obj=%s)", "xmlAttr"), - "xmlNsPtr": ("._o", "xmlNs(_obj=%s)", "xmlNs"), "xmlNs *": ("._o", "xmlNs(_obj=%s)", "xmlNs"), - "xmlDtdPtr": ("._o", "xmlDtd(_obj=%s)", "xmlDtd"), "xmlDtd *": ("._o", "xmlDtd(_obj=%s)", "xmlDtd"), - "xmlEntityPtr": ("._o", "xmlEntity(_obj=%s)", "xmlEntity"), "xmlEntity *": ("._o", "xmlEntity(_obj=%s)", "xmlEntity"), - "xmlElementPtr": ("._o", "xmlElement(_obj=%s)", "xmlElement"), "xmlElement *": ("._o", "xmlElement(_obj=%s)", "xmlElement"), - "xmlAttributePtr": ("._o", "xmlAttribute(_obj=%s)", "xmlAttribute"), "xmlAttribute *": ("._o", "xmlAttribute(_obj=%s)", "xmlAttribute"), - "xmlXPathContextPtr": ("._o", "xpathContext(_obj=%s)", "xpathContext"), "xmlXPathContext *": ("._o", "xpathContext(_obj=%s)", "xpathContext"), "xmlXPathParserContext *": ("._o", "xpathParserContext(_obj=%s)", "xpathParserContext"), - "xmlXPathParserContextPtr": ("._o", "xpathParserContext(_obj=%s)", "xpathParserContext"), - "xmlParserCtxtPtr": ("._o", "parserCtxt(_obj=%s)", "parserCtxt"), "xmlParserCtxt *": ("._o", "parserCtxt(_obj=%s)", "parserCtxt"), - "htmlParserCtxtPtr": ("._o", "parserCtxt(_obj=%s)", "parserCtxt"), "htmlParserCtxt *": ("._o", "parserCtxt(_obj=%s)", "parserCtxt"), - "xmlValidCtxtPtr": ("._o", "ValidCtxt(_obj=%s)", "ValidCtxt"), - "xmlCatalogPtr": ("._o", "catalog(_obj=%s)", "catalog"), - "xmlURIPtr": ("._o", "URI(_obj=%s)", "URI"), + "xmlValidCtxt *": ("._o", "ValidCtxt(_obj=%s)", "ValidCtxt"), + "xmlCatalog *": ("._o", "catalog(_obj=%s)", "catalog"), + "xmlURI *": ("._o", "URI(_obj=%s)", "URI"), "const xmlError *": ("._o", "Error(_obj=%s)", "Error"), - "xmlErrorPtr": ("._o", "Error(_obj=%s)", "Error"), - "xmlOutputBufferPtr": ("._o", "outputBuffer(_obj=%s)", "outputBuffer"), - "xmlParserInputBufferPtr": ("._o", "inputBuffer(_obj=%s)", "inputBuffer"), - "xmlRegexpPtr": ("._o", "xmlReg(_obj=%s)", "xmlReg"), + "xmlError *": ("._o", "Error(_obj=%s)", "Error"), + "xmlOutputBuffer *": ("._o", "outputBuffer(_obj=%s)", "outputBuffer"), + "xmlParserInputBuffer *": ("._o", "inputBuffer(_obj=%s)", "inputBuffer"), + "xmlRegexp *": ("._o", "xmlReg(_obj=%s)", "xmlReg"), "xmlTextReaderLocatorPtr": ("._o", "xmlTextReaderLocator(_obj=%s)", "xmlTextReaderLocator"), - "xmlTextReaderPtr": ("._o", "xmlTextReader(_obj=%s)", "xmlTextReader"), - 'xmlRelaxNGPtr': ('._o', "relaxNgSchema(_obj=%s)", "relaxNgSchema"), - 'xmlRelaxNGParserCtxtPtr': ('._o', "relaxNgParserCtxt(_obj=%s)", "relaxNgParserCtxt"), - 'xmlRelaxNGValidCtxtPtr': ('._o', "relaxNgValidCtxt(_obj=%s)", "relaxNgValidCtxt"), - 'xmlSchemaPtr': ("._o", "Schema(_obj=%s)", "Schema"), - 'xmlSchemaParserCtxtPtr': ("._o", "SchemaParserCtxt(_obj=%s)", "SchemaParserCtxt"), - 'xmlSchemaValidCtxtPtr': ("._o", "SchemaValidCtxt(_obj=%s)", "SchemaValidCtxt"), + "xmlTextReader *": ("._o", "xmlTextReader(_obj=%s)", "xmlTextReader"), + 'xmlRelaxNG *': ('._o', "relaxNgSchema(_obj=%s)", "relaxNgSchema"), + 'xmlRelaxNGParserCtxt *': ('._o', "relaxNgParserCtxt(_obj=%s)", "relaxNgParserCtxt"), + 'xmlRelaxNGValidCtxt *': ('._o', "relaxNgValidCtxt(_obj=%s)", "relaxNgValidCtxt"), + 'xmlSchema *': ("._o", "Schema(_obj=%s)", "Schema"), + 'xmlSchemaParserCtxt *': ("._o", "SchemaParserCtxt(_obj=%s)", "SchemaParserCtxt"), + 'xmlSchemaValidCtxt *': ("._o", "SchemaValidCtxt(_obj=%s)", "SchemaValidCtxt"), } converter_type = { - "xmlXPathObjectPtr": "xpathObjectRet(%s)", + "xmlXPathObject *": "xpathObjectRet(%s)", } primary_classes = ["xmlNode", "xmlDoc"] diff --git a/relaxng.c b/relaxng.c index 125bad69..4450263e 100644 --- a/relaxng.c +++ b/relaxng.c @@ -542,7 +542,7 @@ typedef int (*xmlRelaxNGTypeHave) (void *data, const xmlChar * type); */ typedef int (*xmlRelaxNGTypeCheck) (void *data, const xmlChar * type, const xmlChar * value, void **result, - xmlNodePtr node); + xmlNode *node); /** * Function provided by a type library to check a value facet @@ -580,10 +580,10 @@ typedef void (*xmlRelaxNGTypeFree) (void *data, void *result); */ typedef int (*xmlRelaxNGTypeCompare) (void *data, const xmlChar * type, const xmlChar * value1, - xmlNodePtr ctxt1, + xmlNode *ctxt1, void *comp1, const xmlChar * value2, - xmlNodePtr ctxt2); + xmlNode *ctxt2); typedef struct _xmlRelaxNGTypeLibrary xmlRelaxNGTypeLibrary; typedef xmlRelaxNGTypeLibrary *xmlRelaxNGTypeLibraryPtr; struct _xmlRelaxNGTypeLibrary { @@ -737,7 +737,7 @@ xmlRelaxNGFreeInnerSchema(xmlRelaxNGPtr schema) * @param schema a schema structure */ void -xmlRelaxNGFree(xmlRelaxNGPtr schema) +xmlRelaxNGFree(xmlRelaxNG *schema) { if (schema == NULL) return; @@ -1326,7 +1326,7 @@ xmlRelaxNGFreeValidState(xmlRelaxNGValidCtxtPtr ctxt, * @returns 0 if success and -1 in case of error */ int -xmlRelaxParserSetFlag(xmlRelaxNGParserCtxtPtr ctxt, int flags) +xmlRelaxParserSetFlag(xmlRelaxNGParserCtxt *ctxt, int flags) { if (ctxt == NULL) return(-1); if (flags & XML_RELAXNGP_FREE_DOC) { @@ -6460,7 +6460,7 @@ xmlRelaxNGParseDocument(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node) * @param URL the location of the schema * @returns the parser context or NULL in case of error */ -xmlRelaxNGParserCtxtPtr +xmlRelaxNGParserCtxt * xmlRelaxNGNewParserCtxt(const char *URL) { xmlRelaxNGParserCtxtPtr ret; @@ -6487,7 +6487,7 @@ xmlRelaxNGNewParserCtxt(const char *URL) * @param size the size of the array * @returns the parser context or NULL in case of error */ -xmlRelaxNGParserCtxtPtr +xmlRelaxNGParserCtxt * xmlRelaxNGNewMemParserCtxt(const char *buffer, int size) { xmlRelaxNGParserCtxtPtr ret; @@ -6515,8 +6515,8 @@ xmlRelaxNGNewMemParserCtxt(const char *buffer, int size) * @param doc a preparsed document tree * @returns the parser context or NULL in case of error */ -xmlRelaxNGParserCtxtPtr -xmlRelaxNGNewDocParserCtxt(xmlDocPtr doc) +xmlRelaxNGParserCtxt * +xmlRelaxNGNewDocParserCtxt(xmlDoc *doc) { xmlRelaxNGParserCtxtPtr ret; xmlDocPtr copy; @@ -6547,7 +6547,7 @@ xmlRelaxNGNewDocParserCtxt(xmlDocPtr doc) * @param ctxt the schema parser context */ void -xmlRelaxNGFreeParserCtxt(xmlRelaxNGParserCtxtPtr ctxt) +xmlRelaxNGFreeParserCtxt(xmlRelaxNGParserCtxt *ctxt) { if (ctxt == NULL) return; @@ -7188,8 +7188,8 @@ xmlRelaxNGCleanupDoc(xmlRelaxNGParserCtxtPtr ctxt, xmlDocPtr doc) * @returns the internal XML RelaxNG structure built from the resource or * NULL in case of error */ -xmlRelaxNGPtr -xmlRelaxNGParse(xmlRelaxNGParserCtxtPtr ctxt) +xmlRelaxNG * +xmlRelaxNGParse(xmlRelaxNGParserCtxt *ctxt) { xmlRelaxNGPtr ret = NULL; xmlDocPtr doc; @@ -7327,7 +7327,7 @@ xmlRelaxNGParse(xmlRelaxNGParserCtxtPtr ctxt) * @param ctx contextual data for the callbacks */ void -xmlRelaxNGSetParserErrors(xmlRelaxNGParserCtxtPtr ctxt, +xmlRelaxNGSetParserErrors(xmlRelaxNGParserCtxt *ctxt, xmlRelaxNGValidityErrorFunc err, xmlRelaxNGValidityWarningFunc warn, void *ctx) { @@ -7349,7 +7349,7 @@ xmlRelaxNGSetParserErrors(xmlRelaxNGParserCtxtPtr ctxt, * @returns -1 in case of failure, 0 otherwise. */ int -xmlRelaxNGGetParserErrors(xmlRelaxNGParserCtxtPtr ctxt, +xmlRelaxNGGetParserErrors(xmlRelaxNGParserCtxt *ctxt, xmlRelaxNGValidityErrorFunc * err, xmlRelaxNGValidityWarningFunc * warn, void **ctx) { @@ -7372,7 +7372,7 @@ xmlRelaxNGGetParserErrors(xmlRelaxNGParserCtxtPtr ctxt, * @param ctx contextual data for the callbacks */ void -xmlRelaxNGSetParserStructuredErrors(xmlRelaxNGParserCtxtPtr ctxt, +xmlRelaxNGSetParserStructuredErrors(xmlRelaxNGParserCtxt *ctxt, xmlStructuredErrorFunc serror, void *ctx) { @@ -7392,7 +7392,7 @@ xmlRelaxNGSetParserStructuredErrors(xmlRelaxNGParserCtxtPtr ctxt, * @param vctxt contextual data for the callbacks */ void -xmlRelaxNGSetResourceLoader(xmlRelaxNGParserCtxtPtr ctxt, +xmlRelaxNGSetResourceLoader(xmlRelaxNGParserCtxt *ctxt, xmlResourceLoader loader, void *vctxt) { if (ctxt == NULL) return; @@ -7589,7 +7589,7 @@ xmlRelaxNGDumpGrammar(FILE * output, xmlRelaxNGGrammarPtr grammar, int top) * @param schema a schema structure */ void -xmlRelaxNGDump(FILE * output, xmlRelaxNGPtr schema) +xmlRelaxNGDump(FILE * output, xmlRelaxNG *schema) { if (output == NULL) return; @@ -7619,7 +7619,7 @@ xmlRelaxNGDump(FILE * output, xmlRelaxNGPtr schema) * @param schema a schema structure */ void -xmlRelaxNGDumpTree(FILE * output, xmlRelaxNGPtr schema) +xmlRelaxNGDumpTree(FILE * output, xmlRelaxNG *schema) { if (output == NULL) return; @@ -7983,9 +7983,9 @@ xmlRelaxNGValidateProgressiveCallback(xmlRegExecCtxtPtr exec * element requires a full node, and -1 in case of error. */ int -xmlRelaxNGValidatePushElement(xmlRelaxNGValidCtxtPtr ctxt, - xmlDocPtr doc ATTRIBUTE_UNUSED, - xmlNodePtr elem) +xmlRelaxNGValidatePushElement(xmlRelaxNGValidCtxt *ctxt, + xmlDoc *doc ATTRIBUTE_UNUSED, + xmlNode *elem) { int ret = 1; @@ -8052,7 +8052,7 @@ xmlRelaxNGValidatePushElement(xmlRelaxNGValidCtxtPtr ctxt, * @returns 1 if no validation problem was found or -1 otherwise */ int -xmlRelaxNGValidatePushCData(xmlRelaxNGValidCtxtPtr ctxt, +xmlRelaxNGValidatePushCData(xmlRelaxNGValidCtxt *ctxt, const xmlChar * data, int len ATTRIBUTE_UNUSED) { int ret = 1; @@ -8086,9 +8086,9 @@ xmlRelaxNGValidatePushCData(xmlRelaxNGValidCtxtPtr ctxt, * @returns 1 if no validation problem was found or 0 otherwise */ int -xmlRelaxNGValidatePopElement(xmlRelaxNGValidCtxtPtr ctxt, - xmlDocPtr doc ATTRIBUTE_UNUSED, - xmlNodePtr elem) +xmlRelaxNGValidatePopElement(xmlRelaxNGValidCtxt *ctxt, + xmlDoc *doc ATTRIBUTE_UNUSED, + xmlNode *elem) { int ret; xmlRegExecCtxtPtr exec; @@ -8125,9 +8125,9 @@ xmlRelaxNGValidatePopElement(xmlRelaxNGValidCtxtPtr ctxt, * @returns 1 if no validation problem was found or -1 in case of error. */ int -xmlRelaxNGValidateFullElement(xmlRelaxNGValidCtxtPtr ctxt, - xmlDocPtr doc ATTRIBUTE_UNUSED, - xmlNodePtr elem) +xmlRelaxNGValidateFullElement(xmlRelaxNGValidCtxt *ctxt, + xmlDoc *doc ATTRIBUTE_UNUSED, + xmlNode *elem) { int ret; xmlRelaxNGValidStatePtr state; @@ -10439,8 +10439,8 @@ xmlRelaxNGCleanPSVI(xmlNodePtr node) { * @param schema a precompiled XML RelaxNGs * @returns the validation context or NULL in case of error */ -xmlRelaxNGValidCtxtPtr -xmlRelaxNGNewValidCtxt(xmlRelaxNGPtr schema) +xmlRelaxNGValidCtxt * +xmlRelaxNGNewValidCtxt(xmlRelaxNG *schema) { xmlRelaxNGValidCtxtPtr ret; @@ -10470,7 +10470,7 @@ xmlRelaxNGNewValidCtxt(xmlRelaxNGPtr schema) * @param ctxt the schema validation context */ void -xmlRelaxNGFreeValidCtxt(xmlRelaxNGValidCtxtPtr ctxt) +xmlRelaxNGFreeValidCtxt(xmlRelaxNGValidCtxt *ctxt) { int k; @@ -10516,7 +10516,7 @@ xmlRelaxNGFreeValidCtxt(xmlRelaxNGValidCtxtPtr ctxt) * @param ctx the functions context */ void -xmlRelaxNGSetValidErrors(xmlRelaxNGValidCtxtPtr ctxt, +xmlRelaxNGSetValidErrors(xmlRelaxNGValidCtxt *ctxt, xmlRelaxNGValidityErrorFunc err, xmlRelaxNGValidityWarningFunc warn, void *ctx) { @@ -10536,7 +10536,7 @@ xmlRelaxNGSetValidErrors(xmlRelaxNGValidCtxtPtr ctxt, * @param ctx the functions context */ void -xmlRelaxNGSetValidStructuredErrors(xmlRelaxNGValidCtxtPtr ctxt, +xmlRelaxNGSetValidStructuredErrors(xmlRelaxNGValidCtxt *ctxt, xmlStructuredErrorFunc serror, void *ctx) { if (ctxt == NULL) @@ -10557,7 +10557,7 @@ xmlRelaxNGSetValidStructuredErrors(xmlRelaxNGValidCtxtPtr ctxt, * @returns -1 in case of error and 0 otherwise */ int -xmlRelaxNGGetValidErrors(xmlRelaxNGValidCtxtPtr ctxt, +xmlRelaxNGGetValidErrors(xmlRelaxNGValidCtxt *ctxt, xmlRelaxNGValidityErrorFunc * err, xmlRelaxNGValidityWarningFunc * warn, void **ctx) { @@ -10581,7 +10581,7 @@ xmlRelaxNGGetValidErrors(xmlRelaxNGValidCtxtPtr ctxt, * number otherwise and -1 in case of internal or API error. */ int -xmlRelaxNGValidateDoc(xmlRelaxNGValidCtxtPtr ctxt, xmlDocPtr doc) +xmlRelaxNGValidateDoc(xmlRelaxNGValidCtxt *ctxt, xmlDoc *doc) { int ret; diff --git a/schematron.c b/schematron.c index 69bd6ef9..5c1a27bf 100644 --- a/schematron.c +++ b/schematron.c @@ -604,7 +604,7 @@ xmlSchematronNewSchematron(xmlSchematronParserCtxtPtr ctxt) * @param schema a schema structure */ void -xmlSchematronFree(xmlSchematronPtr schema) +xmlSchematronFree(xmlSchematron *schema) { if (schema == NULL) return; @@ -628,7 +628,7 @@ xmlSchematronFree(xmlSchematronPtr schema) * @param URL the location of the schema * @returns the parser context or NULL in case of error */ -xmlSchematronParserCtxtPtr +xmlSchematronParserCtxt * xmlSchematronNewParserCtxt(const char *URL) { xmlSchematronParserCtxtPtr ret; @@ -666,7 +666,7 @@ xmlSchematronNewParserCtxt(const char *URL) * @param size the size of the array * @returns the parser context or NULL in case of error */ -xmlSchematronParserCtxtPtr +xmlSchematronParserCtxt * xmlSchematronNewMemParserCtxt(const char *buffer, int size) { xmlSchematronParserCtxtPtr ret; @@ -701,8 +701,8 @@ xmlSchematronNewMemParserCtxt(const char *buffer, int size) * @param doc a preparsed document tree * @returns the parser context or NULL in case of error */ -xmlSchematronParserCtxtPtr -xmlSchematronNewDocParserCtxt(xmlDocPtr doc) +xmlSchematronParserCtxt * +xmlSchematronNewDocParserCtxt(xmlDoc *doc) { xmlSchematronParserCtxtPtr ret; @@ -737,7 +737,7 @@ xmlSchematronNewDocParserCtxt(xmlDocPtr doc) * @param ctxt the schema parser context */ void -xmlSchematronFreeParserCtxt(xmlSchematronParserCtxtPtr ctxt) +xmlSchematronFreeParserCtxt(xmlSchematronParserCtxt *ctxt) { if (ctxt == NULL) return; @@ -1198,8 +1198,8 @@ done: * @returns the internal XML Schematron structure built from the resource or * NULL in case of error */ -xmlSchematronPtr -xmlSchematronParse(xmlSchematronParserCtxtPtr ctxt) +xmlSchematron * +xmlSchematronParse(xmlSchematronParserCtxt *ctxt) { xmlSchematronPtr ret = NULL; xmlDocPtr doc; @@ -1659,7 +1659,7 @@ xmlSchematronReportPattern(xmlSchematronValidCtxtPtr ctxt, * @param ctx the functions context */ void -xmlSchematronSetValidStructuredErrors(xmlSchematronValidCtxtPtr ctxt, +xmlSchematronSetValidStructuredErrors(xmlSchematronValidCtxt *ctxt, xmlStructuredErrorFunc serror, void *ctx) { if (ctxt == NULL) @@ -1677,8 +1677,8 @@ xmlSchematronSetValidStructuredErrors(xmlSchematronValidCtxtPtr ctxt, * @param options a set of xmlSchematronValidOptions * @returns the validation context or NULL in case of error */ -xmlSchematronValidCtxtPtr -xmlSchematronNewValidCtxt(xmlSchematronPtr schema, int options) +xmlSchematronValidCtxt * +xmlSchematronNewValidCtxt(xmlSchematron *schema, int options) { int i; xmlSchematronValidCtxtPtr ret; @@ -1717,7 +1717,7 @@ xmlSchematronNewValidCtxt(xmlSchematronPtr schema, int options) * @param ctxt the schema validation context */ void -xmlSchematronFreeValidCtxt(xmlSchematronValidCtxtPtr ctxt) +xmlSchematronFreeValidCtxt(xmlSchematronValidCtxt *ctxt) { if (ctxt == NULL) return; @@ -1895,7 +1895,7 @@ xmlSchematronUnregisterVariables(xmlSchematronValidCtxtPtr vctxt, * and an error count otherwise. */ int -xmlSchematronValidateDoc(xmlSchematronValidCtxtPtr ctxt, xmlDocPtr instance) +xmlSchematronValidateDoc(xmlSchematronValidCtxt *ctxt, xmlDoc *instance) { xmlNodePtr cur, root; xmlSchematronPatternPtr pattern; diff --git a/shell.c b/shell.c index 9b5f3125..8ecc05b9 100644 --- a/shell.c +++ b/shell.c @@ -1065,7 +1065,7 @@ xmllintShellReadline(char *prompt) { * @param output the output FILE*, defaults to stdout if NULL */ void -xmllintShell(xmlDocPtr doc, const char *filename, FILE * output) +xmllintShell(xmlDoc *doc, const char *filename, FILE * output) { char prompt[500] = "/ > "; char *cmdline = NULL, *cur; diff --git a/threads.c b/threads.c index 8410168d..0c356510 100644 --- a/threads.c +++ b/threads.c @@ -53,7 +53,7 @@ static xmlRMutex xmlLibraryLock; * @param mutex the mutex */ void -xmlInitMutex(xmlMutexPtr mutex) +xmlInitMutex(xmlMutex *mutex) { #ifdef HAVE_POSIX_THREADS pthread_mutex_init(&mutex->lock, NULL); @@ -70,7 +70,7 @@ xmlInitMutex(xmlMutexPtr mutex) * * @returns a new simple mutex pointer or NULL in case of error */ -xmlMutexPtr +xmlMutex * xmlNewMutex(void) { xmlMutexPtr tok; @@ -88,7 +88,7 @@ xmlNewMutex(void) * @param mutex the simple mutex */ void -xmlCleanupMutex(xmlMutexPtr mutex) +xmlCleanupMutex(xmlMutex *mutex) { #ifdef HAVE_POSIX_THREADS pthread_mutex_destroy(&mutex->lock); @@ -105,7 +105,7 @@ xmlCleanupMutex(xmlMutexPtr mutex) * @param tok the simple mutex */ void -xmlFreeMutex(xmlMutexPtr tok) +xmlFreeMutex(xmlMutex *tok) { if (tok == NULL) return; @@ -120,7 +120,7 @@ xmlFreeMutex(xmlMutexPtr tok) * @param tok the simple mutex */ void -xmlMutexLock(xmlMutexPtr tok) +xmlMutexLock(xmlMutex *tok) { if (tok == NULL) return; @@ -142,7 +142,7 @@ xmlMutexLock(xmlMutexPtr tok) * @param tok the simple mutex */ void -xmlMutexUnlock(xmlMutexPtr tok) +xmlMutexUnlock(xmlMutex *tok) { if (tok == NULL) return; @@ -159,7 +159,7 @@ xmlMutexUnlock(xmlMutexPtr tok) * @param tok mutex */ void -xmlInitRMutex(xmlRMutexPtr tok) { +xmlInitRMutex(xmlRMutex *tok) { (void) tok; #ifdef HAVE_POSIX_THREADS @@ -180,7 +180,7 @@ xmlInitRMutex(xmlRMutexPtr tok) { * * @returns the new reentrant mutex pointer or NULL in case of error */ -xmlRMutexPtr +xmlRMutex * xmlNewRMutex(void) { xmlRMutexPtr tok; @@ -198,7 +198,7 @@ xmlNewRMutex(void) * @param tok mutex */ void -xmlCleanupRMutex(xmlRMutexPtr tok) { +xmlCleanupRMutex(xmlRMutex *tok) { (void) tok; #ifdef HAVE_POSIX_THREADS @@ -216,7 +216,7 @@ xmlCleanupRMutex(xmlRMutexPtr tok) { * @param tok the reentrant mutex */ void -xmlFreeRMutex(xmlRMutexPtr tok) +xmlFreeRMutex(xmlRMutex *tok) { if (tok == NULL) return; @@ -230,7 +230,7 @@ xmlFreeRMutex(xmlRMutexPtr tok) * @param tok the reentrant mutex */ void -xmlRMutexLock(xmlRMutexPtr tok) +xmlRMutexLock(xmlRMutex *tok) { if (tok == NULL) return; @@ -262,7 +262,7 @@ xmlRMutexLock(xmlRMutexPtr tok) * @param tok the reentrant mutex */ void -xmlRMutexUnlock(xmlRMutexPtr tok ATTRIBUTE_UNUSED) +xmlRMutexUnlock(xmlRMutex *tok ATTRIBUTE_UNUSED) { if (tok == NULL) return; diff --git a/tree.c b/tree.c index 09c82336..3404c8e9 100644 --- a/tree.c +++ b/tree.c @@ -663,8 +663,8 @@ try_complex: * @returns a new namespace pointer or NULL if arguments are invalid, * the prefix is already in use or a memory allocation failed. */ -xmlNsPtr -xmlNewNs(xmlNodePtr node, const xmlChar *href, const xmlChar *prefix) { +xmlNs * +xmlNewNs(xmlNode *node, const xmlChar *href, const xmlChar *prefix) { xmlNsPtr cur; if ((node != NULL) && (node->type != XML_ELEMENT_NODE)) @@ -727,7 +727,7 @@ error: * @param ns a namespace pointer (optional) */ void -xmlSetNs(xmlNodePtr node, xmlNsPtr ns) { +xmlSetNs(xmlNode *node, xmlNs *ns) { if (node == NULL) { return; } @@ -742,7 +742,7 @@ xmlSetNs(xmlNodePtr node, xmlNsPtr ns) { * @param cur the namespace pointer */ void -xmlFreeNs(xmlNsPtr cur) { +xmlFreeNs(xmlNs *cur) { if (cur == NULL) { return; } @@ -757,7 +757,7 @@ xmlFreeNs(xmlNsPtr cur) { * @param cur the first namespace pointer */ void -xmlFreeNsList(xmlNsPtr cur) { +xmlFreeNsList(xmlNs *cur) { xmlNsPtr next; if (cur == NULL) { return; @@ -785,8 +785,8 @@ xmlFreeNsList(xmlNsPtr cur) { * @returns a pointer to the new DTD object or NULL if arguments are * invalid or a memory allocation failed. */ -xmlDtdPtr -xmlNewDtd(xmlDocPtr doc, const xmlChar *name, +xmlDtd * +xmlNewDtd(xmlDoc *doc, const xmlChar *name, const xmlChar *ExternalID, const xmlChar *SystemID) { xmlDtdPtr cur; @@ -837,7 +837,7 @@ error: * @param doc the document pointer * @returns a pointer to the DTD object or NULL if not found. */ -xmlDtdPtr +xmlDtd * xmlGetIntSubset(const xmlDoc *doc) { xmlNodePtr cur; @@ -867,8 +867,8 @@ xmlGetIntSubset(const xmlDoc *doc) { * @returns a pointer to the new or existing DTD object or NULL if * arguments are invalid or a memory allocation failed. */ -xmlDtdPtr -xmlCreateIntSubset(xmlDocPtr doc, const xmlChar *name, +xmlDtd * +xmlCreateIntSubset(xmlDoc *doc, const xmlChar *name, const xmlChar *ExternalID, const xmlChar *SystemID) { xmlDtdPtr cur; @@ -967,7 +967,7 @@ error: * @param cur the DTD structure to free up */ void -xmlFreeDtd(xmlDtdPtr cur) { +xmlFreeDtd(xmlDtd *cur) { xmlDictPtr dict = NULL; if (cur == NULL) { @@ -1021,7 +1021,7 @@ xmlFreeDtd(xmlDtdPtr cur) { * @param version XML version string like `"1.0"` (optional) * @returns a new document or NULL if a memory allocation failed. */ -xmlDocPtr +xmlDoc * xmlNewDoc(const xmlChar *version) { xmlDocPtr cur; @@ -1065,7 +1065,7 @@ xmlNewDoc(const xmlChar *version) { * @param cur pointer to the document */ void -xmlFreeDoc(xmlDocPtr cur) { +xmlFreeDoc(xmlDoc *cur) { xmlDtdPtr extSubset, intSubset; xmlDictPtr dict = NULL; @@ -1391,7 +1391,7 @@ out: * @returns 0 on success, -1 if a memory allocation failed. */ int -xmlNodeParseContent(xmlNodePtr node, const xmlChar *content, int len) { +xmlNodeParseContent(xmlNode *node, const xmlChar *content, int len) { return(xmlNodeParseContentInternal(node->doc, node, content, len, NULL)); } @@ -1406,7 +1406,7 @@ xmlNodeParseContent(xmlNodePtr node, const xmlChar *content, int len) { * @returns a pointer to the first child or NULL if the value if empty * or a memory allocation failed. */ -xmlNodePtr +xmlNode * xmlStringLenGetNodeList(const xmlDoc *doc, const xmlChar *value, int len) { xmlNodePtr ret; @@ -1431,7 +1431,7 @@ xmlStringLenGetNodeList(const xmlDoc *doc, const xmlChar *value, int len) { * @returns a pointer to the first child or NULL if the value if empty * or a memory allocation failed. */ -xmlNodePtr +xmlNode * xmlStringGetNodeList(const xmlDoc *doc, const xmlChar *value) { xmlNodePtr ret; @@ -1522,7 +1522,7 @@ error: * @returns a string or NULL if a memory allocation failed. */ xmlChar * -xmlNodeListGetString(xmlDocPtr doc, const xmlNode *list, int inLine) +xmlNodeListGetString(xmlDoc *doc, const xmlNode *list, int inLine) { int flags = 0; int escape = 0; @@ -1693,8 +1693,8 @@ error: * @returns a pointer to the attribute or NULL if arguments are invalid * or a memory allocation failed. */ -xmlAttrPtr -xmlNewProp(xmlNodePtr node, const xmlChar *name, const xmlChar *value) { +xmlAttr * +xmlNewProp(xmlNode *node, const xmlChar *name, const xmlChar *value) { if (name == NULL) { return(NULL); @@ -1719,8 +1719,8 @@ xmlNewProp(xmlNodePtr node, const xmlChar *name, const xmlChar *value) { * @returns a pointer to the attribute or NULL if arguments are invalid * or a memory allocation failed. */ -xmlAttrPtr -xmlNewNsProp(xmlNodePtr node, xmlNsPtr ns, const xmlChar *name, +xmlAttr * +xmlNewNsProp(xmlNode *node, xmlNs *ns, const xmlChar *name, const xmlChar *value) { if (name == NULL) { @@ -1744,8 +1744,8 @@ xmlNewNsProp(xmlNodePtr node, xmlNsPtr ns, const xmlChar *name, * @returns a pointer to the attribute or NULL if arguments are invalid * or a memory allocation failed. */ -xmlAttrPtr -xmlNewNsPropEatName(xmlNodePtr node, xmlNsPtr ns, xmlChar *name, +xmlAttr * +xmlNewNsPropEatName(xmlNode *node, xmlNs *ns, xmlChar *name, const xmlChar *value) { if (name == NULL) { @@ -1769,8 +1769,8 @@ xmlNewNsPropEatName(xmlNodePtr node, xmlNsPtr ns, xmlChar *name, * @returns a pointer to the attribute or NULL if arguments are invalid * or a memory allocation failed. */ -xmlAttrPtr -xmlNewDocProp(xmlDocPtr doc, const xmlChar *name, const xmlChar *value) { +xmlAttr * +xmlNewDocProp(xmlDoc *doc, const xmlChar *name, const xmlChar *value) { xmlAttrPtr cur; if (name == NULL) { @@ -1813,7 +1813,7 @@ error: * @param cur the first attribute in the list */ void -xmlFreePropList(xmlAttrPtr cur) { +xmlFreePropList(xmlAttr *cur) { xmlAttrPtr next; if (cur == NULL) return; while (cur != NULL) { @@ -1829,7 +1829,7 @@ xmlFreePropList(xmlAttrPtr cur) { * @param cur an attribute */ void -xmlFreeProp(xmlAttrPtr cur) { +xmlFreeProp(xmlAttr *cur) { xmlDictPtr dict = NULL; if (cur == NULL) return; @@ -1859,7 +1859,7 @@ xmlFreeProp(xmlAttrPtr cur) { * arguments are invalid. */ int -xmlRemoveProp(xmlAttrPtr cur) { +xmlRemoveProp(xmlAttr *cur) { xmlAttrPtr tmp; if (cur == NULL) { return(-1); @@ -1897,8 +1897,8 @@ xmlRemoveProp(xmlAttrPtr cur) { * @returns a pointer to the new node object or NULL if arguments are * invalid or a memory allocation failed. */ -xmlNodePtr -xmlNewDocPI(xmlDocPtr doc, const xmlChar *name, const xmlChar *content) { +xmlNode * +xmlNewDocPI(xmlDoc *doc, const xmlChar *name, const xmlChar *content) { xmlNodePtr cur; if (name == NULL) { @@ -1946,7 +1946,7 @@ error: * @returns a pointer to the new node object or NULL if arguments are * invalid or a memory allocation failed. */ -xmlNodePtr +xmlNode * xmlNewPI(const xmlChar *name, const xmlChar *content) { return(xmlNewDocPI(NULL, name, content)); } @@ -1961,8 +1961,8 @@ xmlNewPI(const xmlChar *name, const xmlChar *content) { * @returns a pointer to the new node object or NULL if arguments are * invalid or a memory allocation failed. */ -xmlNodePtr -xmlNewNode(xmlNsPtr ns, const xmlChar *name) { +xmlNode * +xmlNewNode(xmlNs *ns, const xmlChar *name) { return(xmlNewDocNode(NULL, ns, name, NULL)); } @@ -1980,8 +1980,8 @@ xmlNewNode(xmlNsPtr ns, const xmlChar *name) { * @returns a pointer to the new node object or NULL if arguments are * invalid or a memory allocation failed. */ -xmlNodePtr -xmlNewNodeEatName(xmlNsPtr ns, xmlChar *name) { +xmlNode * +xmlNewNodeEatName(xmlNs *ns, xmlChar *name) { return(xmlNewDocNodeEatName(NULL, ns, name, NULL)); } @@ -2038,8 +2038,8 @@ xmlNewElem(xmlDocPtr doc, xmlNsPtr ns, const xmlChar *name, * @returns a pointer to the new node object or NULL if arguments are * invalid or a memory allocation failed. */ -xmlNodePtr -xmlNewDocNode(xmlDocPtr doc, xmlNsPtr ns, +xmlNode * +xmlNewDocNode(xmlDoc *doc, xmlNs *ns, const xmlChar *name, const xmlChar *content) { xmlNodePtr cur; xmlChar *copy; @@ -2082,8 +2082,8 @@ xmlNewDocNode(xmlDocPtr doc, xmlNsPtr ns, * @returns a pointer to the new node object or NULL if arguments are * invalid or a memory allocation failed. */ -xmlNodePtr -xmlNewDocNodeEatName(xmlDocPtr doc, xmlNsPtr ns, +xmlNode * +xmlNewDocNodeEatName(xmlDoc *doc, xmlNs *ns, xmlChar *name, const xmlChar *content) { xmlNodePtr cur; @@ -2115,8 +2115,8 @@ xmlNewDocNodeEatName(xmlDocPtr doc, xmlNsPtr ns, * @returns a pointer to the new node object or NULL if arguments are * invalid or a memory allocation failed. */ -xmlNodePtr -xmlNewDocRawNode(xmlDocPtr doc, xmlNsPtr ns, +xmlNode * +xmlNewDocRawNode(xmlDoc *doc, xmlNs *ns, const xmlChar *name, const xmlChar *content) { xmlNodePtr cur; @@ -2147,8 +2147,8 @@ xmlNewDocRawNode(xmlDocPtr doc, xmlNsPtr ns, * @returns a pointer to the new node object or NULL if a memory * allocation failed. */ -xmlNodePtr -xmlNewDocFragment(xmlDocPtr doc) { +xmlNode * +xmlNewDocFragment(xmlDoc *doc) { xmlNodePtr cur; /* @@ -2176,7 +2176,7 @@ xmlNewDocFragment(xmlDocPtr doc) { * @returns a pointer to the new node object or NULL if a memory * allocation failed. */ -xmlNodePtr +xmlNode * xmlNewText(const xmlChar *content) { xmlNodePtr cur; @@ -2221,8 +2221,8 @@ error: * @returns a pointer to the new node object or NULL if arguments * are invalid or a memory allocation failed. */ -xmlNodePtr -xmlNewTextChild(xmlNodePtr parent, xmlNsPtr ns, +xmlNode * +xmlNewTextChild(xmlNode *parent, xmlNs *ns, const xmlChar *name, const xmlChar *content) { xmlNodePtr cur, prev; @@ -2314,8 +2314,8 @@ xmlNewEntityRef(xmlDocPtr doc, xmlChar *name) { * @returns a pointer to the new node object or NULL if arguments are * invalid or a memory allocation failed. */ -xmlNodePtr -xmlNewCharRef(xmlDocPtr doc, const xmlChar *name) { +xmlNode * +xmlNewCharRef(xmlDoc *doc, const xmlChar *name) { xmlChar *copy; if (name == NULL) @@ -2348,7 +2348,7 @@ xmlNewCharRef(xmlDocPtr doc, const xmlChar *name) { * @returns a pointer to the new node object or NULL if arguments are * invalid or a memory allocation failed. */ -xmlNodePtr +xmlNode * xmlNewReference(const xmlDoc *doc, const xmlChar *name) { xmlNodePtr cur; xmlEntityPtr ent; @@ -2408,7 +2408,7 @@ error: * @returns a pointer to the new node object or NULL if a memory * allocation failed. */ -xmlNodePtr +xmlNode * xmlNewDocText(const xmlDoc *doc, const xmlChar *content) { xmlNodePtr cur; @@ -2427,7 +2427,7 @@ xmlNewDocText(const xmlDoc *doc, const xmlChar *content) { * @returns a pointer to the new node object or NULL if a memory * allocation failed. */ -xmlNodePtr +xmlNode * xmlNewTextLen(const xmlChar *content, int len) { xmlNodePtr cur; @@ -2463,8 +2463,8 @@ xmlNewTextLen(const xmlChar *content, int len) { * @returns a pointer to the new node object or NULL if a memory * allocation failed. */ -xmlNodePtr -xmlNewDocTextLen(xmlDocPtr doc, const xmlChar *content, int len) { +xmlNode * +xmlNewDocTextLen(xmlDoc *doc, const xmlChar *content, int len) { xmlNodePtr cur; cur = xmlNewTextLen(content, len); @@ -2481,7 +2481,7 @@ xmlNewDocTextLen(xmlDocPtr doc, const xmlChar *content, int len) { * @returns a pointer to the new node object or NULL if a memory * allocation failed. */ -xmlNodePtr +xmlNode * xmlNewComment(const xmlChar *content) { xmlNodePtr cur; @@ -2519,8 +2519,8 @@ error: * @returns a pointer to the new node object or NULL if a memory * allocation failed. */ -xmlNodePtr -xmlNewCDataBlock(xmlDocPtr doc, const xmlChar *content, int len) { +xmlNode * +xmlNewCDataBlock(xmlDoc *doc, const xmlChar *content, int len) { xmlNodePtr cur; /* @@ -2554,8 +2554,8 @@ xmlNewCDataBlock(xmlDocPtr doc, const xmlChar *content, int len) { * @returns a pointer to the new node object or NULL if a memory * allocation failed. */ -xmlNodePtr -xmlNewDocComment(xmlDocPtr doc, const xmlChar *content) { +xmlNode * +xmlNewDocComment(xmlDoc *doc, const xmlChar *content) { xmlNodePtr cur; cur = xmlNewComment(content); @@ -2727,7 +2727,7 @@ xmlNodeSetDoc(xmlNodePtr node, xmlDocPtr doc) { * may be lost. */ int -xmlSetTreeDoc(xmlNodePtr tree, xmlDocPtr doc) { +xmlSetTreeDoc(xmlNode *tree, xmlDoc *doc) { int ret = 0; if ((tree == NULL) || (tree->type == XML_NAMESPACE_DECL)) @@ -2775,7 +2775,7 @@ xmlSetTreeDoc(xmlNodePtr tree, xmlDocPtr doc) { * may be lost. */ int -xmlSetListDoc(xmlNodePtr list, xmlDocPtr doc) { +xmlSetListDoc(xmlNode *list, xmlDoc *doc) { xmlNodePtr cur; int ret = 0; @@ -2812,8 +2812,8 @@ xmlSetListDoc(xmlNodePtr list, xmlDocPtr doc) { * @returns a pointer to the new node object or NULL if arguments * are invalid or a memory allocation failed. */ -xmlNodePtr -xmlNewChild(xmlNodePtr parent, xmlNsPtr ns, +xmlNode * +xmlNewChild(xmlNode *parent, xmlNs *ns, const xmlChar *name, const xmlChar *content) { xmlNodePtr cur, prev; @@ -3032,8 +3032,8 @@ xmlInsertNode(xmlDocPtr doc, xmlNodePtr cur, xmlNodePtr parent, * @returns `cur` or a sibling if `cur` was merged. Returns NULL * if arguments are invalid or a memory allocation failed. */ -xmlNodePtr -xmlAddNextSibling(xmlNodePtr prev, xmlNodePtr cur) { +xmlNode * +xmlAddNextSibling(xmlNode *prev, xmlNode *cur) { if ((prev == NULL) || (prev->type == XML_NAMESPACE_DECL) || (cur == NULL) || (cur->type == XML_NAMESPACE_DECL) || (cur == prev)) @@ -3061,8 +3061,8 @@ xmlAddNextSibling(xmlNodePtr prev, xmlNodePtr cur) { * @returns `cur` or a sibling if `cur` was merged. Returns NULL * if arguments are invalid or a memory allocation failed. */ -xmlNodePtr -xmlAddPrevSibling(xmlNodePtr next, xmlNodePtr cur) { +xmlNode * +xmlAddPrevSibling(xmlNode *next, xmlNode *cur) { if ((next == NULL) || (next->type == XML_NAMESPACE_DECL) || (cur == NULL) || (cur->type == XML_NAMESPACE_DECL) || (cur == next)) @@ -3092,8 +3092,8 @@ xmlAddPrevSibling(xmlNodePtr next, xmlNodePtr cur) { * @returns `cur` or a sibling if `cur` was merged. Returns NULL * if arguments are invalid or a memory allocation failed. */ -xmlNodePtr -xmlAddSibling(xmlNodePtr node, xmlNodePtr cur) { +xmlNode * +xmlAddSibling(xmlNode *node, xmlNode *cur) { if ((node == NULL) || (node->type == XML_NAMESPACE_DECL) || (cur == NULL) || (cur->type == XML_NAMESPACE_DECL) || (cur == node)) @@ -3126,8 +3126,8 @@ xmlAddSibling(xmlNodePtr node, xmlNodePtr cur) { * @param cur the first node in the list * @returns the last child or NULL in case of error. */ -xmlNodePtr -xmlAddChildList(xmlNodePtr parent, xmlNodePtr cur) { +xmlNode * +xmlAddChildList(xmlNode *parent, xmlNode *cur) { xmlNodePtr iter; xmlNodePtr prev; int oom; @@ -3233,8 +3233,8 @@ xmlAddChildList(xmlNodePtr parent, xmlNodePtr cur) { * @returns `cur` or a sibling if `cur` was merged. Returns NULL * if arguments are invalid or a memory allocation failed. */ -xmlNodePtr -xmlAddChild(xmlNodePtr parent, xmlNodePtr cur) { +xmlNode * +xmlAddChild(xmlNode *parent, xmlNode *cur) { xmlNodePtr prev; if ((parent == NULL) || (parent->type == XML_NAMESPACE_DECL) || @@ -3275,7 +3275,7 @@ xmlAddChild(xmlNodePtr parent, xmlNodePtr cur) { * @param parent the parent node * @returns the last child or NULL if parent has no children. */ -xmlNodePtr +xmlNode * xmlGetLastChild(const xmlNode *parent) { if ((parent == NULL) || (parent->type == XML_NAMESPACE_DECL)) { return(NULL); @@ -3297,7 +3297,7 @@ xmlGetLastChild(const xmlNode *parent) { * invalid. */ unsigned long -xmlChildElementCount(xmlNodePtr parent) { +xmlChildElementCount(xmlNode *parent) { unsigned long ret = 0; xmlNodePtr cur = NULL; @@ -3330,8 +3330,8 @@ xmlChildElementCount(xmlNodePtr parent) { * @param parent the parent node * @returns the first element or NULL if parent has no children. */ -xmlNodePtr -xmlFirstElementChild(xmlNodePtr parent) { +xmlNode * +xmlFirstElementChild(xmlNode *parent) { xmlNodePtr cur = NULL; if (parent == NULL) @@ -3363,8 +3363,8 @@ xmlFirstElementChild(xmlNodePtr parent) { * @param parent the parent node * @returns the last element or NULL if parent has no children. */ -xmlNodePtr -xmlLastElementChild(xmlNodePtr parent) { +xmlNode * +xmlLastElementChild(xmlNode *parent) { xmlNodePtr cur = NULL; if (parent == NULL) @@ -3396,8 +3396,8 @@ xmlLastElementChild(xmlNodePtr parent) { * @param node the current node * @returns the sibling or NULL if no sibling was found. */ -xmlNodePtr -xmlPreviousElementSibling(xmlNodePtr node) { +xmlNode * +xmlPreviousElementSibling(xmlNode *node) { if (node == NULL) return(NULL); switch (node->type) { @@ -3430,8 +3430,8 @@ xmlPreviousElementSibling(xmlNodePtr node) { * @param node the current node * @returns the sibling or NULL if no sibling was found. */ -xmlNodePtr -xmlNextElementSibling(xmlNodePtr node) { +xmlNode * +xmlNextElementSibling(xmlNode *node) { if (node == NULL) return(NULL); switch (node->type) { @@ -3463,7 +3463,7 @@ xmlNextElementSibling(xmlNodePtr node) { * @param cur the first node in the list */ void -xmlFreeNodeList(xmlNodePtr cur) { +xmlFreeNodeList(xmlNode *cur) { xmlNodePtr next; xmlNodePtr parent; xmlDictPtr dict = NULL; @@ -3553,7 +3553,7 @@ xmlFreeNodeList(xmlNodePtr cur) { * @param cur the node */ void -xmlFreeNode(xmlNodePtr cur) { +xmlFreeNode(xmlNode *cur) { xmlDictPtr dict = NULL; if (cur == NULL) return; @@ -3653,7 +3653,7 @@ xmlUnlinkNodeInternal(xmlNodePtr cur) { * @param cur the node */ void -xmlUnlinkNode(xmlNodePtr cur) { +xmlUnlinkNode(xmlNode *cur) { if (cur == NULL) return; @@ -3693,8 +3693,8 @@ xmlUnlinkNode(xmlNodePtr cur) { * @returns `old` or NULL if arguments are invalid or a memory * allocation failed. */ -xmlNodePtr -xmlReplaceNode(xmlNodePtr old, xmlNodePtr cur) { +xmlNode * +xmlReplaceNode(xmlNode *old, xmlNode *cur) { if (old == cur) return(NULL); if ((old == NULL) || (old->type == XML_NAMESPACE_DECL) || (old->parent == NULL)) { @@ -3750,8 +3750,8 @@ xmlReplaceNode(xmlNodePtr old, xmlNodePtr cur) { * @returns the copied namespace or NULL if a memory allocation * failed. */ -xmlNsPtr -xmlCopyNamespace(xmlNsPtr cur) { +xmlNs * +xmlCopyNamespace(xmlNs *cur) { xmlNsPtr ret; if (cur == NULL) return(NULL); @@ -3772,8 +3772,8 @@ xmlCopyNamespace(xmlNsPtr cur) { * @returns the head of the copied list or NULL if a memory * allocation failed. */ -xmlNsPtr -xmlCopyNamespaceList(xmlNsPtr cur) { +xmlNs * +xmlCopyNamespaceList(xmlNs *cur) { xmlNsPtr ret = NULL; xmlNsPtr p = NULL,q; @@ -3926,8 +3926,8 @@ error: * @returns the copied attribute or NULL if a memory allocation * failed. */ -xmlAttrPtr -xmlCopyProp(xmlNodePtr target, xmlAttrPtr cur) { +xmlAttr * +xmlCopyProp(xmlNode *target, xmlAttr *cur) { return xmlCopyPropInternal(NULL, target, cur); } @@ -3941,8 +3941,8 @@ xmlCopyProp(xmlNodePtr target, xmlAttrPtr cur) { * @returns the head of the copied list or NULL if a memory * allocation failed. */ -xmlAttrPtr -xmlCopyPropList(xmlNodePtr target, xmlAttrPtr cur) { +xmlAttr * +xmlCopyPropList(xmlNode *target, xmlAttr *cur) { xmlAttrPtr ret = NULL; xmlAttrPtr p = NULL,q; @@ -3994,8 +3994,8 @@ xmlCopyPropList(xmlNodePtr target, xmlAttrPtr cur) { * @param extended flags * @returns the copy or NULL if a memory allocation failed. */ -xmlNodePtr -xmlStaticCopyNode(xmlNodePtr node, xmlDocPtr doc, xmlNodePtr parent, +xmlNode * +xmlStaticCopyNode(xmlNode *node, xmlDoc *doc, xmlNode *parent, int extended) { xmlNodePtr ret; @@ -4188,8 +4188,8 @@ error: * @param parent target node (optional) * @returns a the copy or NULL in case of error. */ -xmlNodePtr -xmlStaticCopyNodeList(xmlNodePtr node, xmlDocPtr doc, xmlNodePtr parent) { +xmlNode * +xmlStaticCopyNodeList(xmlNode *node, xmlDoc *doc, xmlNode *parent) { xmlNodePtr ret = NULL; xmlNodePtr p = NULL,q; xmlDtdPtr newSubset = NULL; @@ -4279,8 +4279,8 @@ error: * @param extended mode of operation * @returns the copied node or NULL if a memory allocation failed. */ -xmlNodePtr -xmlCopyNode(xmlNodePtr node, int extended) { +xmlNode * +xmlCopyNode(xmlNode *node, int extended) { xmlNodePtr ret; ret = xmlStaticCopyNode(node, NULL, NULL, extended); @@ -4303,8 +4303,8 @@ xmlCopyNode(xmlNodePtr node, int extended) { * @param extended mode of operation * @returns the copied node or NULL if a memory allocation failed. */ -xmlNodePtr -xmlDocCopyNode(xmlNodePtr node, xmlDocPtr doc, int extended) { +xmlNode * +xmlDocCopyNode(xmlNode *node, xmlDoc *doc, int extended) { xmlNodePtr ret; ret = xmlStaticCopyNode(node, doc, NULL, extended); @@ -4319,7 +4319,7 @@ xmlDocCopyNode(xmlNodePtr node, xmlDocPtr doc, int extended) { * @returns the head of the copied list or NULL if a memory * allocation failed. */ -xmlNodePtr xmlDocCopyNodeList(xmlDocPtr doc, xmlNodePtr node) { +xmlNode *xmlDocCopyNodeList(xmlDoc *doc, xmlNode *node) { xmlNodePtr ret = xmlStaticCopyNodeList(node, doc, NULL); return(ret); } @@ -4333,7 +4333,7 @@ xmlNodePtr xmlDocCopyNodeList(xmlDocPtr doc, xmlNodePtr node) { * @returns the head of the copied list or NULL if a memory * allocation failed. */ -xmlNodePtr xmlCopyNodeList(xmlNodePtr node) { +xmlNode *xmlCopyNodeList(xmlNode *node) { xmlNodePtr ret = xmlStaticCopyNodeList(node, NULL, NULL); return(ret); } @@ -4344,8 +4344,8 @@ xmlNodePtr xmlCopyNodeList(xmlNodePtr node) { * @param dtd the DTD * @returns the copied DTD or NULL if a memory allocation failed. */ -xmlDtdPtr -xmlCopyDtd(xmlDtdPtr dtd) { +xmlDtd * +xmlCopyDtd(xmlDtd *dtd) { xmlDtdPtr ret; xmlNodePtr cur, p = NULL, q; @@ -4451,8 +4451,8 @@ error: * @returns the copied document or NULL if a memory allocation * failed. */ -xmlDocPtr -xmlCopyDoc(xmlDocPtr doc, int recursive) { +xmlDoc * +xmlCopyDoc(xmlDoc *doc, int recursive) { xmlDocPtr ret; if (doc == NULL) return(NULL); @@ -4847,7 +4847,7 @@ xmlGetNodePath(const xmlNode *node) * @param doc the document * @returns the root element or NULL if no element was found. */ -xmlNodePtr +xmlNode * xmlDocGetRootElement(const xmlDoc *doc) { xmlNodePtr ret; @@ -4875,8 +4875,8 @@ xmlDocGetRootElement(const xmlDoc *doc) { * @returns the unlinked old root element or NULL if the document * didn't have a root element or a memory allocation failed. */ -xmlNodePtr -xmlDocSetRootElement(xmlDocPtr doc, xmlNodePtr root) { +xmlNode * +xmlDocSetRootElement(xmlDoc *doc, xmlNode *root) { xmlNodePtr old = NULL; if (doc == NULL) return(NULL); @@ -4916,7 +4916,7 @@ xmlDocSetRootElement(xmlDocPtr doc, xmlNodePtr root) { * memory allocation failed. */ int -xmlNodeSetLang(xmlNodePtr cur, const xmlChar *lang) { +xmlNodeSetLang(xmlNode *cur, const xmlChar *lang) { xmlNsPtr ns; xmlAttrPtr attr; int res; @@ -4976,7 +4976,7 @@ xmlNodeGetLang(const xmlNode *cur) { * memory allocation failed. */ int -xmlNodeSetSpacePreserve(xmlNodePtr cur, int val) { +xmlNodeSetSpacePreserve(xmlNode *cur, int val) { xmlNsPtr ns; xmlAttrPtr attr; const char *string; @@ -5048,7 +5048,7 @@ xmlNodeGetSpacePreserve(const xmlNode *cur) { * @param name the new tag name */ void -xmlNodeSetName(xmlNodePtr cur, const xmlChar *name) { +xmlNodeSetName(xmlNode *cur, const xmlChar *name) { xmlDocPtr doc; xmlDictPtr dict; const xmlChar *copy; @@ -5095,7 +5095,7 @@ xmlNodeSetName(xmlNodePtr cur, const xmlChar *name) { * @returns 0 on success, -1 on error. */ int -xmlNodeSetBase(xmlNodePtr cur, const xmlChar* uri) { +xmlNodeSetBase(xmlNode *cur, const xmlChar* uri) { xmlNsPtr ns; xmlChar* fixed; @@ -5285,7 +5285,7 @@ xmlNodeGetBase(const xmlDoc *doc, const xmlNode *cur) { * @returns 0 in case of success and -1 in case of error. */ int -xmlNodeBufGetContent(xmlBufferPtr buffer, const xmlNode *cur) +xmlNodeBufGetContent(xmlBuffer *buffer, const xmlNode *cur) { xmlBufPtr buf; int ret1, ret2; @@ -5375,7 +5375,7 @@ xmlBufGetChildContent(xmlBufPtr buf, const xmlNode *tree) { * @returns 0 in case of success and -1 in case of error. */ int -xmlBufGetNodeContent(xmlBufPtr buf, const xmlNode *cur) +xmlBufGetNodeContent(xmlBuf *buf, const xmlNode *cur) { if ((cur == NULL) || (buf == NULL)) return(-1); @@ -5548,7 +5548,7 @@ xmlNodeSetContentInternal(xmlNodePtr cur, const xmlChar *content, int len) { * @returns 0 on success, 1 on error, -1 if a memory allocation failed. */ int -xmlNodeSetContent(xmlNodePtr cur, const xmlChar *content) { +xmlNodeSetContent(xmlNode *cur, const xmlChar *content) { return(xmlNodeSetContentInternal(cur, content, -1)); } @@ -5561,7 +5561,7 @@ xmlNodeSetContent(xmlNodePtr cur, const xmlChar *content) { * @returns 0 on success, 1 on error, -1 if a memory allocation failed. */ int -xmlNodeSetContentLen(xmlNodePtr cur, const xmlChar *content, int len) { +xmlNodeSetContentLen(xmlNode *cur, const xmlChar *content, int len) { return(xmlNodeSetContentInternal(cur, content, len)); } @@ -5578,7 +5578,7 @@ xmlNodeSetContentLen(xmlNodePtr cur, const xmlChar *content, int len) { * @returns 0 on success, 1 on error, -1 if a memory allocation failed. */ int -xmlNodeAddContentLen(xmlNodePtr cur, const xmlChar *content, int len) { +xmlNodeAddContentLen(xmlNode *cur, const xmlChar *content, int len) { if (cur == NULL) return(1); if ((content == NULL) || (len <= 0)) @@ -5625,7 +5625,7 @@ xmlNodeAddContentLen(xmlNodePtr cur, const xmlChar *content, int len) { * @returns 0 on success, 1 on error, -1 if a memory allocation failed. */ int -xmlNodeAddContent(xmlNodePtr cur, const xmlChar *content) { +xmlNodeAddContent(xmlNode *cur, const xmlChar *content) { return(xmlNodeAddContentLen(cur, content, xmlStrlen(content))); } @@ -5638,8 +5638,8 @@ xmlNodeAddContent(xmlNodePtr cur, const xmlChar *content) { * @param second the second text node being merged * @returns the first text node augmented or NULL in case of error. */ -xmlNodePtr -xmlTextMerge(xmlNodePtr first, xmlNodePtr second) { +xmlNode * +xmlTextMerge(xmlNode *first, xmlNode *second) { if (first == NULL) return(second); if (second == NULL) @@ -5674,7 +5674,7 @@ xmlTextMerge(xmlNodePtr first, xmlNodePtr second) { */ int xmlGetNsListSafe(const xmlDoc *doc ATTRIBUTE_UNUSED, const xmlNode *node, - xmlNsPtr **out) + xmlNs ***out) { xmlNsPtr cur; xmlNsPtr *namespaces = NULL; @@ -5746,7 +5746,7 @@ xmlGetNsListSafe(const xmlDoc *doc ATTRIBUTE_UNUSED, const xmlNode *node, * be freed by the caller or NULL if no namespaces were found or * a memory allocation failed. */ -xmlNsPtr * +xmlNs ** xmlGetNsList(const xmlDoc *doc, const xmlNode *node) { xmlNsPtr *ret; @@ -5811,8 +5811,8 @@ xmlTreeEnsureXMLDecl(xmlDocPtr doc) * other errors. */ int -xmlSearchNsSafe(xmlNodePtr node, const xmlChar *prefix, - xmlNsPtr *out) { +xmlSearchNsSafe(xmlNode *node, const xmlChar *prefix, + xmlNs **out) { xmlNsPtr cur; xmlDocPtr doc; xmlNodePtr orig = node; @@ -5899,8 +5899,8 @@ xmlSearchNsSafe(xmlNodePtr node, const xmlChar *prefix, * a memory allocation failed. Allocations can only fail if the `xml` * namespace is queried. */ -xmlNsPtr -xmlSearchNs(xmlDocPtr doc ATTRIBUTE_UNUSED, xmlNodePtr node, +xmlNs * +xmlSearchNs(xmlDoc *doc ATTRIBUTE_UNUSED, xmlNode *node, const xmlChar *nameSpace) { xmlNsPtr cur; @@ -5958,8 +5958,8 @@ xmlNsInScope(xmlDocPtr doc ATTRIBUTE_UNUSED, xmlNodePtr node, * other errors. */ int -xmlSearchNsByHrefSafe(xmlNodePtr node, const xmlChar *href, - xmlNsPtr *out) { +xmlSearchNsByHrefSafe(xmlNode *node, const xmlChar *href, + xmlNs **out) { xmlNsPtr cur; xmlDocPtr doc; xmlNodePtr orig = node; @@ -6048,8 +6048,8 @@ xmlSearchNsByHrefSafe(xmlNodePtr node, const xmlChar *href, * a memory allocation failed. Allocations can only fail if the `xml` * namespace is queried. */ -xmlNsPtr -xmlSearchNsByHref(xmlDocPtr doc ATTRIBUTE_UNUSED, xmlNodePtr node, +xmlNs * +xmlSearchNsByHref(xmlDoc *doc ATTRIBUTE_UNUSED, xmlNode *node, const xmlChar * href) { xmlNsPtr cur; @@ -6160,7 +6160,7 @@ xmlGrowNsCache(xmlNsCache **cache, int *capacity) { * @returns 0 on success or -1 in case of error. */ int -xmlReconciliateNs(xmlDocPtr doc, xmlNodePtr tree) { +xmlReconciliateNs(xmlDoc *doc, xmlNode *tree) { xmlNsCache *cache = NULL; int sizeCache = 0; int nbCache = 0; @@ -6433,7 +6433,7 @@ xmlGetPropNodeValueInternal(const xmlAttr *prop) * neither was found. Also returns NULL if a memory allocation failed, * making this function unreliable. */ -xmlAttrPtr +xmlAttr * xmlHasProp(const xmlNode *node, const xmlChar *name) { xmlAttrPtr prop; xmlDocPtr doc; @@ -6487,7 +6487,7 @@ xmlHasProp(const xmlNode *node, const xmlChar *name) { * neither was found. Also returns NULL if a memory allocation failed * making this function unreliable. */ -xmlAttrPtr +xmlAttr * xmlHasNsProp(const xmlNode *node, const xmlChar *name, const xmlChar *nameSpace) { return(xmlGetPropNodeInternal(node, name, nameSpace, 1)); @@ -6630,7 +6630,7 @@ xmlGetNsProp(const xmlNode *node, const xmlChar *name, const xmlChar *nameSpace) * @returns 0 if successful, -1 if not found */ int -xmlUnsetProp(xmlNodePtr node, const xmlChar *name) { +xmlUnsetProp(xmlNode *node, const xmlChar *name) { xmlAttrPtr prop; prop = xmlGetPropNodeInternal(node, name, NULL, 0); @@ -6650,7 +6650,7 @@ xmlUnsetProp(xmlNodePtr node, const xmlChar *name) { * @returns 0 if successful, -1 if not found */ int -xmlUnsetNsProp(xmlNodePtr node, xmlNsPtr ns, const xmlChar *name) { +xmlUnsetNsProp(xmlNode *node, xmlNs *ns, const xmlChar *name) { xmlAttrPtr prop; prop = xmlGetPropNodeInternal(node, name, @@ -6672,8 +6672,8 @@ xmlUnsetNsProp(xmlNodePtr node, xmlNsPtr ns, const xmlChar *name) { * @param value the attribute value * @returns the attribute pointer. */ -xmlAttrPtr -xmlSetProp(xmlNodePtr node, const xmlChar *name, const xmlChar *value) { +xmlAttr * +xmlSetProp(xmlNode *node, const xmlChar *name, const xmlChar *value) { xmlNsPtr ns = NULL; const xmlChar *localname; xmlChar *prefix; @@ -6712,8 +6712,8 @@ xmlSetProp(xmlNodePtr node, const xmlChar *name, const xmlChar *value) { * @param value the attribute value * @returns the attribute pointer. */ -xmlAttrPtr -xmlSetNsProp(xmlNodePtr node, xmlNsPtr ns, const xmlChar *name, +xmlAttr * +xmlSetNsProp(xmlNode *node, xmlNs *ns, const xmlChar *name, const xmlChar *value) { xmlAttrPtr prop; @@ -6821,7 +6821,7 @@ xmlIsBlankNode(const xmlNode *node) { */ int -xmlTextConcat(xmlNodePtr node, const xmlChar *content, int len) { +xmlTextConcat(xmlNode *node, const xmlChar *content, int len) { if (node == NULL) return(-1); @@ -6855,7 +6855,7 @@ xmlGetDocCompressMode (const xmlDoc *doc) { * @param mode the compression ratio */ void -xmlSetDocCompressMode (xmlDocPtr doc, int mode) { +xmlSetDocCompressMode (xmlDoc *doc, int mode) { if (doc == NULL) return; if (mode < 0) doc->compression = 0; else if (mode > 9) doc->compression = 9; @@ -7089,7 +7089,7 @@ xmlDOMWrapStoreNs(xmlDocPtr doc, * * @returns the xmlDOMWrapCtxtPtr or NULL in case of an internal error. */ -xmlDOMWrapCtxtPtr +xmlDOMWrapCtxt * xmlDOMWrapNewCtxt(void) { xmlDOMWrapCtxtPtr ret; @@ -7107,7 +7107,7 @@ xmlDOMWrapNewCtxt(void) * @param ctxt the DOM-wrapper context */ void -xmlDOMWrapFreeCtxt(xmlDOMWrapCtxtPtr ctxt) +xmlDOMWrapFreeCtxt(xmlDOMWrapCtxt *ctxt) { if (ctxt == NULL) return; @@ -7252,8 +7252,8 @@ xmlDOMWrapNSNormAddNsMapItem2(xmlNsPtr **list, int *size, int *number, * -1 on API and internal errors. */ int -xmlDOMWrapRemoveNode(xmlDOMWrapCtxtPtr ctxt, xmlDocPtr doc, - xmlNodePtr node, int options ATTRIBUTE_UNUSED) +xmlDOMWrapRemoveNode(xmlDOMWrapCtxt *ctxt, xmlDoc *doc, + xmlNode *node, int options ATTRIBUTE_UNUSED) { xmlNsPtr *list = NULL; int sizeList = 0, nbList = 0, ret = 0, i, j; @@ -7766,8 +7766,8 @@ typedef enum { * @returns 0 if succeeded, -1 otherwise and on API/internal errors. */ int -xmlDOMWrapReconcileNamespaces(xmlDOMWrapCtxtPtr ctxt ATTRIBUTE_UNUSED, - xmlNodePtr elem, +xmlDOMWrapReconcileNamespaces(xmlDOMWrapCtxt *ctxt ATTRIBUTE_UNUSED, + xmlNode *elem, int options) { int depth = -1, adoptns = 0, parnsdone = 0; @@ -8311,12 +8311,12 @@ leave_node: * -1 on API/internal errors. */ int -xmlDOMWrapCloneNode(xmlDOMWrapCtxtPtr ctxt, - xmlDocPtr sourceDoc, - xmlNodePtr node, - xmlNodePtr *resNode, - xmlDocPtr destDoc, - xmlNodePtr destParent, +xmlDOMWrapCloneNode(xmlDOMWrapCtxt *ctxt, + xmlDoc *sourceDoc, + xmlNode *node, + xmlNode **resNode, + xmlDoc *destDoc, + xmlNode *destParent, int deep, int options ATTRIBUTE_UNUSED) { @@ -8917,11 +8917,11 @@ xmlDOMWrapAdoptAttr(xmlDOMWrapCtxtPtr ctxt, * -1 on API/internal errors. */ int -xmlDOMWrapAdoptNode(xmlDOMWrapCtxtPtr ctxt, - xmlDocPtr sourceDoc, - xmlNodePtr node, - xmlDocPtr destDoc, - xmlNodePtr destParent, +xmlDOMWrapAdoptNode(xmlDOMWrapCtxt *ctxt, + xmlDoc *sourceDoc, + xmlNode *node, + xmlDoc *destDoc, + xmlNode *destParent, int options) { int ret = 0; diff --git a/uri.c b/uri.c index 8cea7a79..9071d59f 100644 --- a/uri.c +++ b/uri.c @@ -959,7 +959,7 @@ xmlParse3986URIReference(xmlURIPtr uri, const char *str) { * or -1 if a memory allocation failed. */ int -xmlParseURISafe(const char *str, xmlURIPtr *uriOut) { +xmlParseURISafe(const char *str, xmlURI **uriOut) { xmlURIPtr uri; int ret; @@ -991,7 +991,7 @@ xmlParseURISafe(const char *str, xmlURIPtr *uriOut) { * @param str the URI string to analyze * @returns a newly built xmlURIPtr or NULL in case of error */ -xmlURIPtr +xmlURI * xmlParseURI(const char *str) { xmlURIPtr uri; xmlParseURISafe(str, &uri); @@ -1009,7 +1009,7 @@ xmlParseURI(const char *str) { * @returns 0 or the error code */ int -xmlParseURIReference(xmlURIPtr uri, const char *str) { +xmlParseURIReference(xmlURI *uri, const char *str) { return(xmlParse3986URIReference(uri, str)); } @@ -1022,7 +1022,7 @@ xmlParseURIReference(xmlURIPtr uri, const char *str) { * @param raw if 1 unescaping of URI pieces are disabled * @returns a newly built xmlURIPtr or NULL in case of error */ -xmlURIPtr +xmlURI * xmlParseURIRaw(const char *str, int raw) { xmlURIPtr uri; int ret; @@ -1054,7 +1054,7 @@ xmlParseURIRaw(const char *str, int raw) { * * @returns the new structure or NULL in case of error */ -xmlURIPtr +xmlURI * xmlCreateURI(void) { xmlURIPtr ret; @@ -1092,7 +1092,7 @@ xmlSaveUriRealloc(xmlChar *ret, int *max) { * @returns a new string (to be deallocated by caller) */ xmlChar * -xmlSaveUri(xmlURIPtr uri) { +xmlSaveUri(xmlURI *uri) { xmlChar *ret = NULL; xmlChar *temp; const char *p; @@ -1364,7 +1364,7 @@ mem_error: * @param uri pointer to an xmlURI */ void -xmlPrintURI(FILE *stream, xmlURIPtr uri) { +xmlPrintURI(FILE *stream, xmlURI *uri) { xmlChar *out; out = xmlSaveUri(uri); @@ -1409,7 +1409,7 @@ xmlCleanURI(xmlURIPtr uri) { * @param uri pointer to an xmlURI */ void -xmlFreeURI(xmlURIPtr uri) { +xmlFreeURI(xmlURI *uri) { if (uri == NULL) return; if (uri->scheme != NULL) xmlFree(uri->scheme); diff --git a/valid.c b/valid.c index e20c93b3..98dd5202 100644 --- a/valid.c +++ b/valid.c @@ -583,7 +583,7 @@ xmlValidBuildAContentModel(xmlElementContentPtr content, * @returns 1 in case of success, 0 in case of error */ int -xmlValidBuildContentModel(xmlValidCtxtPtr ctxt, xmlElementPtr elem) { +xmlValidBuildContentModel(xmlValidCtxt *ctxt, xmlElement *elem) { int ret = 0; if ((ctxt == NULL) || (elem == NULL)) @@ -650,7 +650,7 @@ done: * @returns the new validation context or NULL if a memory * allocation failed. */ -xmlValidCtxtPtr xmlNewValidCtxt(void) { +xmlValidCtxt *xmlNewValidCtxt(void) { xmlValidCtxtPtr ret; ret = xmlMalloc(sizeof (xmlValidCtxt)); @@ -668,7 +668,7 @@ xmlValidCtxtPtr xmlNewValidCtxt(void) { * @param cur the validation context to free */ void -xmlFreeValidCtxt(xmlValidCtxtPtr cur) { +xmlFreeValidCtxt(xmlValidCtxt *cur) { if (cur == NULL) return; if (cur->vstateTab != NULL) @@ -691,8 +691,8 @@ xmlFreeValidCtxt(xmlValidCtxtPtr cur) { * @returns the new element content structure or NULL on * error. */ -xmlElementContentPtr -xmlNewDocElementContent(xmlDocPtr doc, const xmlChar *name, +xmlElementContent * +xmlNewDocElementContent(xmlDoc *doc, const xmlChar *name, xmlElementContentType type) { xmlElementContentPtr ret; xmlDictPtr dict = NULL; @@ -771,7 +771,7 @@ error: * @returns the new element content structure or NULL on * error. */ -xmlElementContentPtr +xmlElementContent * xmlNewElementContent(const xmlChar *name, xmlElementContentType type) { return(xmlNewDocElementContent(NULL, name, type)); } @@ -785,8 +785,8 @@ xmlNewElementContent(const xmlChar *name, xmlElementContentType type) { * @param cur An element content pointer. * @returns the new xmlElementContentPtr or NULL in case of error. */ -xmlElementContentPtr -xmlCopyDocElementContent(xmlDocPtr doc, xmlElementContentPtr cur) { +xmlElementContent * +xmlCopyDocElementContent(xmlDoc *doc, xmlElementContent *cur) { xmlElementContentPtr ret = NULL, prev = NULL, tmp; xmlDictPtr dict = NULL; @@ -879,8 +879,8 @@ error: * @param cur An element content pointer. * @returns the new xmlElementContentPtr or NULL in case of error. */ -xmlElementContentPtr -xmlCopyElementContent(xmlElementContentPtr cur) { +xmlElementContent * +xmlCopyElementContent(xmlElementContent *cur) { return(xmlCopyDocElementContent(NULL, cur)); } @@ -893,7 +893,7 @@ xmlCopyElementContent(xmlElementContentPtr cur) { * @param cur the element content tree to free */ void -xmlFreeDocElementContent(xmlDocPtr doc, xmlElementContentPtr cur) { +xmlFreeDocElementContent(xmlDoc *doc, xmlElementContent *cur) { xmlDictPtr dict = NULL; size_t depth = 0; @@ -960,7 +960,7 @@ xmlFreeDocElementContent(xmlDocPtr doc, xmlElementContentPtr cur) { * @param cur the element content tree to free */ void -xmlFreeElementContent(xmlElementContentPtr cur) { +xmlFreeElementContent(xmlElementContent *cur) { xmlFreeDocElementContent(NULL, cur); } @@ -976,7 +976,7 @@ xmlFreeElementContent(xmlElementContentPtr cur) { */ void xmlSprintfElementContent(char *buf ATTRIBUTE_UNUSED, - xmlElementContentPtr content ATTRIBUTE_UNUSED, + xmlElementContent *content ATTRIBUTE_UNUSED, int englob ATTRIBUTE_UNUSED) { } #endif /* LIBXML_OUTPUT_ENABLED */ @@ -993,7 +993,7 @@ xmlSprintfElementContent(char *buf ATTRIBUTE_UNUSED, * @param englob 1 if one must print the englobing parenthesis, 0 otherwise */ void -xmlSnprintfElementContent(char *buf, int size, xmlElementContentPtr content, int englob) { +xmlSnprintfElementContent(char *buf, int size, xmlElementContent *content, int englob) { int len; if (content == NULL) return; @@ -1124,11 +1124,11 @@ xmlFreeElement(xmlElementPtr elem) { * @param content the element content tree or NULL * @returns the entity or NULL on error. */ -xmlElementPtr -xmlAddElementDecl(xmlValidCtxtPtr ctxt, - xmlDtdPtr dtd, const xmlChar *name, +xmlElement * +xmlAddElementDecl(xmlValidCtxt *ctxt, + xmlDtd *dtd, const xmlChar *name, xmlElementTypeVal type, - xmlElementContentPtr content) { + xmlElementContent *content) { xmlElementPtr ret; xmlElementTablePtr table; xmlAttributePtr oldAttributes = NULL; @@ -1333,7 +1333,7 @@ xmlFreeElementTableEntry(void *elem, const xmlChar *name ATTRIBUTE_UNUSED) { * @param table An element table */ void -xmlFreeElementTable(xmlElementTablePtr table) { +xmlFreeElementTable(xmlElementTable *table) { xmlHashFree(table, xmlFreeElementTableEntry); } @@ -1387,8 +1387,8 @@ error: * @param table An element table * @returns the new xmlElementTablePtr or NULL in case of error. */ -xmlElementTablePtr -xmlCopyElementTable(xmlElementTablePtr table) { +xmlElementTable * +xmlCopyElementTable(xmlElementTable *table) { return(xmlHashCopySafe(table, xmlCopyElement, xmlFreeElementTableEntry)); } @@ -1403,7 +1403,7 @@ xmlCopyElementTable(xmlElementTablePtr table) { * @param elem An element table */ void -xmlDumpElementDecl(xmlBufferPtr buf, xmlElementPtr elem) { +xmlDumpElementDecl(xmlBuffer *buf, xmlElement *elem) { xmlSaveCtxtPtr save; if ((buf == NULL) || (elem == NULL)) @@ -1439,7 +1439,7 @@ xmlDumpElementDeclScan(void *elem, void *save, * @param table An element table */ void -xmlDumpElementTable(xmlBufferPtr buf, xmlElementTablePtr table) { +xmlDumpElementTable(xmlBuffer *buf, xmlElementTable *table) { xmlSaveCtxtPtr save; if ((buf == NULL) || (table == NULL)) @@ -1461,7 +1461,7 @@ xmlDumpElementTable(xmlBufferPtr buf, xmlElementTablePtr table) { * @returns the xmlEnumerationPtr just created or NULL in case * of error. */ -xmlEnumerationPtr +xmlEnumeration * xmlCreateEnumeration(const xmlChar *name) { xmlEnumerationPtr ret; @@ -1487,7 +1487,7 @@ xmlCreateEnumeration(const xmlChar *name) { * @param cur the tree to free. */ void -xmlFreeEnumeration(xmlEnumerationPtr cur) { +xmlFreeEnumeration(xmlEnumeration *cur) { while (cur != NULL) { xmlEnumerationPtr next = cur->next; @@ -1507,8 +1507,8 @@ xmlFreeEnumeration(xmlEnumerationPtr cur) { * @returns the xmlEnumerationPtr just created or NULL in case * of error. */ -xmlEnumerationPtr -xmlCopyEnumeration(xmlEnumerationPtr cur) { +xmlEnumeration * +xmlCopyEnumeration(xmlEnumeration *cur) { xmlEnumerationPtr ret = NULL; xmlEnumerationPtr last = NULL; @@ -1621,12 +1621,12 @@ xmlFreeAttribute(xmlAttributePtr attr) { * @param tree if it's an enumeration, the associated list * @returns the attribute decl or NULL on error. */ -xmlAttributePtr -xmlAddAttributeDecl(xmlValidCtxtPtr ctxt, - xmlDtdPtr dtd, const xmlChar *elem, +xmlAttribute * +xmlAddAttributeDecl(xmlValidCtxt *ctxt, + xmlDtd *dtd, const xmlChar *elem, const xmlChar *name, const xmlChar *ns, xmlAttributeType type, xmlAttributeDefault def, - const xmlChar *defaultValue, xmlEnumerationPtr tree) { + const xmlChar *defaultValue, xmlEnumeration *tree) { xmlAttributePtr ret = NULL; xmlAttributeTablePtr table; xmlElementPtr elemDef; @@ -1862,7 +1862,7 @@ xmlFreeAttributeTableEntry(void *attr, const xmlChar *name ATTRIBUTE_UNUSED) { * @param table An attribute table */ void -xmlFreeAttributeTable(xmlAttributeTablePtr table) { +xmlFreeAttributeTable(xmlAttributeTable *table) { xmlHashFree(table, xmlFreeAttributeTableEntry); } @@ -1925,8 +1925,8 @@ error: * @param table An attribute table * @returns the new xmlAttributeTablePtr or NULL in case of error. */ -xmlAttributeTablePtr -xmlCopyAttributeTable(xmlAttributeTablePtr table) { +xmlAttributeTable * +xmlCopyAttributeTable(xmlAttributeTable *table) { return(xmlHashCopySafe(table, xmlCopyAttribute, xmlFreeAttributeTableEntry)); } @@ -1942,7 +1942,7 @@ xmlCopyAttributeTable(xmlAttributeTablePtr table) { * @param attr An attribute declaration */ void -xmlDumpAttributeDecl(xmlBufferPtr buf, xmlAttributePtr attr) { +xmlDumpAttributeDecl(xmlBuffer *buf, xmlAttribute *attr) { xmlSaveCtxtPtr save; if ((buf == NULL) || (attr == NULL)) @@ -1978,7 +1978,7 @@ xmlDumpAttributeDeclScan(void *attr, void *save, * @param table an attribute table */ void -xmlDumpAttributeTable(xmlBufferPtr buf, xmlAttributeTablePtr table) { +xmlDumpAttributeTable(xmlBuffer *buf, xmlAttributeTable *table) { xmlSaveCtxtPtr save; if ((buf == NULL) || (table == NULL)) @@ -2026,8 +2026,8 @@ xmlFreeNotation(xmlNotationPtr nota) { * @param SystemID the system identifier or NULL * @returns the notation or NULL on error. */ -xmlNotationPtr -xmlAddNotationDecl(xmlValidCtxtPtr ctxt, xmlDtdPtr dtd, +xmlNotation * +xmlAddNotationDecl(xmlValidCtxt *ctxt, xmlDtd *dtd, const xmlChar *name, const xmlChar *PublicID, const xmlChar *SystemID) { xmlNotationPtr ret = NULL; @@ -2117,7 +2117,7 @@ xmlFreeNotationTableEntry(void *nota, const xmlChar *name ATTRIBUTE_UNUSED) { * @param table An notation table */ void -xmlFreeNotationTable(xmlNotationTablePtr table) { +xmlFreeNotationTable(xmlNotationTable *table) { xmlHashFree(table, xmlFreeNotationTableEntry); } @@ -2167,8 +2167,8 @@ error: * @param table A notation table * @returns the new xmlNotationTablePtr or NULL in case of error. */ -xmlNotationTablePtr -xmlCopyNotationTable(xmlNotationTablePtr table) { +xmlNotationTable * +xmlCopyNotationTable(xmlNotationTable *table) { return(xmlHashCopySafe(table, xmlCopyNotation, xmlFreeNotationTableEntry)); } @@ -2183,7 +2183,7 @@ xmlCopyNotationTable(xmlNotationTablePtr table) { * @param nota A notation declaration */ void -xmlDumpNotationDecl(xmlBufferPtr buf, xmlNotationPtr nota) { +xmlDumpNotationDecl(xmlBuffer *buf, xmlNotation *nota) { xmlSaveCtxtPtr save; if ((buf == NULL) || (nota == NULL)) @@ -2205,7 +2205,7 @@ xmlDumpNotationDecl(xmlBufferPtr buf, xmlNotationPtr nota) { * @param table A notation table */ void -xmlDumpNotationTable(xmlBufferPtr buf, xmlNotationTablePtr table) { +xmlDumpNotationTable(xmlBuffer *buf, xmlNotationTable *table) { xmlSaveCtxtPtr save; if ((buf == NULL) || (table == NULL)) @@ -2361,7 +2361,7 @@ xmlAddIDInternal(xmlAttrPtr attr, const xmlChar *value, xmlIDPtr *idPtr) { * allocation fails. */ int -xmlAddIDSafe(xmlAttrPtr attr, const xmlChar *value) { +xmlAddIDSafe(xmlAttr *attr, const xmlChar *value) { return(xmlAddIDInternal(attr, value, NULL)); } @@ -2374,9 +2374,9 @@ xmlAddIDSafe(xmlAttrPtr attr, const xmlChar *value) { * @param attr the attribute holding the ID * @returns the new xmlIDPtr or NULL on error. */ -xmlIDPtr -xmlAddID(xmlValidCtxtPtr ctxt, xmlDocPtr doc, const xmlChar *value, - xmlAttrPtr attr) { +xmlID * +xmlAddID(xmlValidCtxt *ctxt, xmlDoc *doc, const xmlChar *value, + xmlAttr *attr) { xmlIDPtr id; int res; @@ -2413,7 +2413,7 @@ xmlFreeIDTableEntry(void *id, const xmlChar *name ATTRIBUTE_UNUSED) { * @param table An id table */ void -xmlFreeIDTable(xmlIDTablePtr table) { +xmlFreeIDTable(xmlIDTable *table) { xmlHashFree(table, xmlFreeIDTableEntry); } @@ -2430,7 +2430,7 @@ xmlFreeIDTable(xmlIDTablePtr table) { * allocation failed. */ int -xmlIsID(xmlDocPtr doc, xmlNodePtr elem, xmlAttrPtr attr) { +xmlIsID(xmlDoc *doc, xmlNode *elem, xmlAttr *attr) { if ((attr == NULL) || (attr->name == NULL)) return(0); @@ -2498,7 +2498,7 @@ xmlIsID(xmlDocPtr doc, xmlNodePtr elem, xmlAttrPtr attr) { * @returns -1 if the lookup failed and 0 otherwise. */ int -xmlRemoveID(xmlDocPtr doc, xmlAttrPtr attr) { +xmlRemoveID(xmlDoc *doc, xmlAttr *attr) { xmlIDTablePtr table; if (doc == NULL) return(-1); @@ -2522,8 +2522,8 @@ xmlRemoveID(xmlDocPtr doc, xmlAttrPtr attr) { * @param ID the ID value * @returns the attribute or NULL if not found. */ -xmlAttrPtr -xmlGetID(xmlDocPtr doc, const xmlChar *ID) { +xmlAttr * +xmlGetID(xmlDoc *doc, const xmlChar *ID) { xmlIDTablePtr table; xmlIDPtr id; @@ -2647,9 +2647,9 @@ xmlDummyCompare(const void *data0 ATTRIBUTE_UNUSED, * @param attr the attribute holding the Ref * @returns the new xmlRefPtr or NULL o error. */ -xmlRefPtr -xmlAddRef(xmlValidCtxtPtr ctxt, xmlDocPtr doc, const xmlChar *value, - xmlAttrPtr attr) { +xmlRef * +xmlAddRef(xmlValidCtxt *ctxt, xmlDoc *doc, const xmlChar *value, + xmlAttr *attr) { xmlRefPtr ret = NULL; xmlRefTablePtr table; xmlListPtr ref_list; @@ -2744,7 +2744,7 @@ failed: * @param table a ref table */ void -xmlFreeRefTable(xmlRefTablePtr table) { +xmlFreeRefTable(xmlRefTable *table) { xmlHashFree(table, xmlFreeRefTableEntry); } @@ -2762,7 +2762,7 @@ xmlFreeRefTable(xmlRefTablePtr table) { * @returns 0 or 1 depending on the lookup result. */ int -xmlIsRef(xmlDocPtr doc, xmlNodePtr elem, xmlAttrPtr attr) { +xmlIsRef(xmlDoc *doc, xmlNode *elem, xmlAttr *attr) { if (attr == NULL) return(0); if (doc == NULL) { @@ -2806,7 +2806,7 @@ xmlIsRef(xmlDocPtr doc, xmlNodePtr elem, xmlAttrPtr attr) { * @returns -1 if the lookup failed and 0 otherwise. */ int -xmlRemoveRef(xmlDocPtr doc, xmlAttrPtr attr) { +xmlRemoveRef(xmlDoc *doc, xmlAttr *attr) { xmlListPtr ref_list; xmlRefTablePtr table; xmlChar *ID; @@ -2862,8 +2862,8 @@ xmlRemoveRef(xmlDocPtr doc, xmlAttrPtr attr) { * @param ID the ID value * @returns the list of nodes matching the ID or NULL on error. */ -xmlListPtr -xmlGetRefs(xmlDocPtr doc, const xmlChar *ID) { +xmlList * +xmlGetRefs(xmlDoc *doc, const xmlChar *ID) { xmlRefTablePtr table; if (doc == NULL) { @@ -2897,8 +2897,8 @@ xmlGetRefs(xmlDocPtr doc, const xmlChar *ID) { * @returns the xmlElementPtr or NULL if not found. */ -xmlElementPtr -xmlGetDtdElementDesc(xmlDtdPtr dtd, const xmlChar *name) { +xmlElement * +xmlGetDtdElementDesc(xmlDtd *dtd, const xmlChar *name) { xmlElementTablePtr table; xmlElementPtr cur; const xmlChar *localname; @@ -3000,8 +3000,8 @@ mem_error: * @returns the xmlElementPtr or NULL if not found. */ -xmlElementPtr -xmlGetDtdQElementDesc(xmlDtdPtr dtd, const xmlChar *name, +xmlElement * +xmlGetDtdQElementDesc(xmlDtd *dtd, const xmlChar *name, const xmlChar *prefix) { xmlElementTablePtr table; @@ -3022,8 +3022,8 @@ xmlGetDtdQElementDesc(xmlDtdPtr dtd, const xmlChar *name, * @returns the xmlAttributePtr or NULL if not found. */ -xmlAttributePtr -xmlGetDtdAttrDesc(xmlDtdPtr dtd, const xmlChar *elem, const xmlChar *name) { +xmlAttribute * +xmlGetDtdAttrDesc(xmlDtd *dtd, const xmlChar *elem, const xmlChar *name) { xmlAttributeTablePtr table; xmlAttributePtr cur; const xmlChar *localname; @@ -3057,8 +3057,8 @@ xmlGetDtdAttrDesc(xmlDtdPtr dtd, const xmlChar *elem, const xmlChar *name) { * @returns the xmlAttributePtr or NULL if not found. */ -xmlAttributePtr -xmlGetDtdQAttrDesc(xmlDtdPtr dtd, const xmlChar *elem, const xmlChar *name, +xmlAttribute * +xmlGetDtdQAttrDesc(xmlDtd *dtd, const xmlChar *elem, const xmlChar *name, const xmlChar *prefix) { xmlAttributeTablePtr table; @@ -3077,8 +3077,8 @@ xmlGetDtdQAttrDesc(xmlDtdPtr dtd, const xmlChar *elem, const xmlChar *name, * @returns the xmlNotationPtr or NULL if not found. */ -xmlNotationPtr -xmlGetDtdNotationDesc(xmlDtdPtr dtd, const xmlChar *name) { +xmlNotation * +xmlGetDtdNotationDesc(xmlDtd *dtd, const xmlChar *name) { xmlNotationTablePtr table; if (dtd == NULL) return(NULL); @@ -3102,7 +3102,7 @@ xmlGetDtdNotationDesc(xmlDtdPtr dtd, const xmlChar *name) { */ int -xmlValidateNotationUse(xmlValidCtxtPtr ctxt, xmlDocPtr doc, +xmlValidateNotationUse(xmlValidCtxt *ctxt, xmlDoc *doc, const xmlChar *notationName) { xmlNotationPtr notaDecl; if ((doc == NULL) || (doc->intSubset == NULL) || @@ -3133,7 +3133,7 @@ xmlValidateNotationUse(xmlValidCtxtPtr ctxt, xmlDocPtr doc, */ int -xmlIsMixedElement(xmlDocPtr doc, const xmlChar *name) { +xmlIsMixedElement(xmlDoc *doc, const xmlChar *name) { xmlElementPtr elemDecl; if ((doc == NULL) || (doc->intSubset == NULL)) return(-1); @@ -3501,8 +3501,8 @@ xmlValidateNmtokensValue(const xmlChar *value) { */ int -xmlValidateNotationDecl(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED, xmlDocPtr doc ATTRIBUTE_UNUSED, - xmlNotationPtr nota ATTRIBUTE_UNUSED) { +xmlValidateNotationDecl(xmlValidCtxt *ctxt ATTRIBUTE_UNUSED, xmlDoc *doc ATTRIBUTE_UNUSED, + xmlNotation *nota ATTRIBUTE_UNUSED) { int ret = 1; return(ret); @@ -3714,8 +3714,8 @@ xmlValidateAttributeValue2(xmlValidCtxtPtr ctxt, xmlDocPtr doc, */ xmlChar * -xmlValidCtxtNormalizeAttributeValue(xmlValidCtxtPtr ctxt, xmlDocPtr doc, - xmlNodePtr elem, const xmlChar *name, const xmlChar *value) { +xmlValidCtxtNormalizeAttributeValue(xmlValidCtxt *ctxt, xmlDoc *doc, + xmlNode *elem, const xmlChar *name, const xmlChar *value) { xmlChar *ret; xmlAttributePtr attrDecl = NULL; const xmlChar *localName; @@ -3807,7 +3807,7 @@ done: */ xmlChar * -xmlValidNormalizeAttributeValue(xmlDocPtr doc, xmlNodePtr elem, +xmlValidNormalizeAttributeValue(xmlDoc *doc, xmlNode *elem, const xmlChar *name, const xmlChar *value) { xmlChar *ret; xmlAttributePtr attrDecl = NULL; @@ -3871,8 +3871,8 @@ xmlValidateAttributeIdCallback(void *payload, void *data, */ int -xmlValidateAttributeDecl(xmlValidCtxtPtr ctxt, xmlDocPtr doc, - xmlAttributePtr attr) { +xmlValidateAttributeDecl(xmlValidCtxt *ctxt, xmlDoc *doc, + xmlAttribute *attr) { int ret = 1; int val; CHECK_DTD; @@ -3999,8 +3999,8 @@ xmlValidateAttributeDecl(xmlValidCtxtPtr ctxt, xmlDocPtr doc, */ int -xmlValidateElementDecl(xmlValidCtxtPtr ctxt, xmlDocPtr doc, - xmlElementPtr elem) { +xmlValidateElementDecl(xmlValidCtxt *ctxt, xmlDoc *doc, + xmlElement *elem) { int ret = 1; xmlElementPtr tst; const xmlChar *localName; @@ -4132,8 +4132,8 @@ xmlValidateElementDecl(xmlValidCtxtPtr ctxt, xmlDocPtr doc, */ int -xmlValidateOneAttribute(xmlValidCtxtPtr ctxt, xmlDocPtr doc, - xmlNodePtr elem, xmlAttrPtr attr, const xmlChar *value) +xmlValidateOneAttribute(xmlValidCtxt *ctxt, xmlDoc *doc, + xmlNode *elem, xmlAttr *attr, const xmlChar *value) { xmlAttributePtr attrDecl = NULL; const xmlChar *aprefix; @@ -4302,8 +4302,8 @@ xmlValidateOneAttribute(xmlValidCtxtPtr ctxt, xmlDocPtr doc, */ int -xmlValidateOneNamespace(xmlValidCtxtPtr ctxt, xmlDocPtr doc, -xmlNodePtr elem, const xmlChar *prefix, xmlNsPtr ns, const xmlChar *value) { +xmlValidateOneNamespace(xmlValidCtxt *ctxt, xmlDoc *doc, +xmlNode *elem, const xmlChar *prefix, xmlNs *ns, const xmlChar *value) { /* xmlElementPtr elemDecl; */ xmlAttributePtr attrDecl = NULL; int val; @@ -5445,8 +5445,8 @@ xmlValidGetElemDecl(xmlValidCtxtPtr ctxt, xmlDocPtr doc, * @returns 1 if no validation problem was found or 0 otherwise. */ int -xmlValidatePushElement(xmlValidCtxtPtr ctxt, xmlDocPtr doc, - xmlNodePtr elem, const xmlChar *qname) { +xmlValidatePushElement(xmlValidCtxt *ctxt, xmlDoc *doc, + xmlNode *elem, const xmlChar *qname) { int ret = 1; xmlElementPtr eDecl; int extsubset = 0; @@ -5542,7 +5542,7 @@ xmlValidatePushElement(xmlValidCtxtPtr ctxt, xmlDocPtr doc, * @returns 1 if no validation problem was found or 0 otherwise. */ int -xmlValidatePushCData(xmlValidCtxtPtr ctxt, const xmlChar *data, int len) { +xmlValidatePushCData(xmlValidCtxt *ctxt, const xmlChar *data, int len) { int ret = 1; if (ctxt == NULL) @@ -5614,8 +5614,8 @@ done: * @returns 1 if no validation problem was found or 0 otherwise. */ int -xmlValidatePopElement(xmlValidCtxtPtr ctxt, xmlDocPtr doc ATTRIBUTE_UNUSED, - xmlNodePtr elem ATTRIBUTE_UNUSED, +xmlValidatePopElement(xmlValidCtxt *ctxt, xmlDoc *doc ATTRIBUTE_UNUSED, + xmlNode *elem ATTRIBUTE_UNUSED, const xmlChar *qname ATTRIBUTE_UNUSED) { int ret = 1; @@ -5681,8 +5681,8 @@ xmlValidatePopElement(xmlValidCtxtPtr ctxt, xmlDocPtr doc ATTRIBUTE_UNUSED, */ int -xmlValidateOneElement(xmlValidCtxtPtr ctxt, xmlDocPtr doc, - xmlNodePtr elem) { +xmlValidateOneElement(xmlValidCtxt *ctxt, xmlDoc *doc, + xmlNode *elem) { xmlElementPtr elemDecl = NULL; xmlElementContentPtr cont; xmlAttributePtr attr; @@ -6008,7 +6008,7 @@ found: */ int -xmlValidateRoot(xmlValidCtxtPtr ctxt, xmlDocPtr doc) { +xmlValidateRoot(xmlValidCtxt *ctxt, xmlDoc *doc) { xmlNodePtr root; int ret; @@ -6070,7 +6070,7 @@ name_ok: */ int -xmlValidateElement(xmlValidCtxtPtr ctxt, xmlDocPtr doc, xmlNodePtr root) { +xmlValidateElement(xmlValidCtxt *ctxt, xmlDoc *doc, xmlNode *root) { xmlNodePtr elem; xmlAttrPtr attr; xmlNsPtr ns; @@ -6265,7 +6265,7 @@ xmlValidateCheckRefCallback(void *payload, void *data, const xmlChar *name) { */ int -xmlValidateDocumentFinal(xmlValidCtxtPtr ctxt, xmlDocPtr doc) { +xmlValidateDocumentFinal(xmlValidCtxt *ctxt, xmlDoc *doc) { xmlRefTablePtr table; xmlParserCtxtPtr pctxt = NULL; xmlParserInputPtr oldInput = NULL; @@ -6322,7 +6322,7 @@ xmlValidateDocumentFinal(xmlValidCtxtPtr ctxt, xmlDocPtr doc) { */ int -xmlValidateDtd(xmlValidCtxtPtr ctxt, xmlDocPtr doc, xmlDtdPtr dtd) { +xmlValidateDtd(xmlValidCtxt *ctxt, xmlDoc *doc, xmlDtd *dtd) { int ret; xmlDtdPtr oldExt, oldInt; xmlNodePtr root; @@ -6379,7 +6379,7 @@ xmlValidateDtd(xmlValidCtxtPtr ctxt, xmlDocPtr doc, xmlDtdPtr dtd) { * @returns 1 if valid or 0 otherwise. */ int -xmlCtxtValidateDtd(xmlParserCtxtPtr ctxt, xmlDocPtr doc, xmlDtdPtr dtd) { +xmlCtxtValidateDtd(xmlParserCtxt *ctxt, xmlDoc *doc, xmlDtd *dtd) { if ((ctxt == NULL) || (ctxt->html)) return(0); @@ -6515,7 +6515,7 @@ xmlValidateAttributeCallback(void *payload, void *data, */ int -xmlValidateDtdFinal(xmlValidCtxtPtr ctxt, xmlDocPtr doc) { +xmlValidateDtdFinal(xmlValidCtxt *ctxt, xmlDoc *doc) { xmlDtdPtr dtd; xmlAttributeTablePtr table; xmlEntitiesTablePtr entities; @@ -6653,7 +6653,7 @@ xmlValidateDocumentInternal(xmlParserCtxtPtr ctxt, xmlValidCtxtPtr vctxt, * @returns 1 if valid or 0 otherwise. */ int -xmlValidateDocument(xmlValidCtxtPtr vctxt, xmlDocPtr doc) { +xmlValidateDocument(xmlValidCtxt *vctxt, xmlDoc *doc) { return(xmlValidateDocumentInternal(NULL, vctxt, doc)); } @@ -6672,7 +6672,7 @@ xmlValidateDocument(xmlValidCtxtPtr vctxt, xmlDocPtr doc) { * @returns 1 if valid or 0 otherwise. */ int -xmlCtxtValidateDocument(xmlParserCtxtPtr ctxt, xmlDocPtr doc) { +xmlCtxtValidateDocument(xmlParserCtxt *ctxt, xmlDoc *doc) { if ((ctxt == NULL) || (ctxt->html)) return(0); diff --git a/xinclude.c b/xinclude.c index b5b888f5..d58a1871 100644 --- a/xinclude.c +++ b/xinclude.c @@ -254,8 +254,8 @@ xmlXIncludeFreeRef(xmlXIncludeRefPtr ref) { * @param doc an XML Document * @returns the new set */ -xmlXIncludeCtxtPtr -xmlXIncludeNewContext(xmlDocPtr doc) { +xmlXIncludeCtxt * +xmlXIncludeNewContext(xmlDoc *doc) { xmlXIncludeCtxtPtr ret; if (doc == NULL) @@ -278,7 +278,7 @@ xmlXIncludeNewContext(xmlDocPtr doc) { * @param ctxt the XInclude context */ void -xmlXIncludeFreeContext(xmlXIncludeCtxtPtr ctxt) { +xmlXIncludeFreeContext(xmlXIncludeCtxt *ctxt) { int i; if (ctxt == NULL) @@ -1972,7 +1972,7 @@ xmlXIncludeDoProcessRoot(xmlXIncludeCtxtPtr ctxt, xmlNodePtr tree) { * @returns the last error code. */ int -xmlXIncludeGetLastError(xmlXIncludeCtxtPtr ctxt) { +xmlXIncludeGetLastError(xmlXIncludeCtxt *ctxt) { if (ctxt == NULL) return(XML_ERR_ARGUMENT); return(ctxt->errNo); @@ -1988,7 +1988,7 @@ xmlXIncludeGetLastError(xmlXIncludeCtxtPtr ctxt) { * @param data user data which will be passed to the handler */ void -xmlXIncludeSetErrorHandler(xmlXIncludeCtxtPtr ctxt, +xmlXIncludeSetErrorHandler(xmlXIncludeCtxt *ctxt, xmlStructuredErrorFunc handler, void *data) { if (ctxt == NULL) return; @@ -2006,7 +2006,7 @@ xmlXIncludeSetErrorHandler(xmlXIncludeCtxtPtr ctxt, * @param data user data which will be passed to the loader */ void -xmlXIncludeSetResourceLoader(xmlXIncludeCtxtPtr ctxt, +xmlXIncludeSetResourceLoader(xmlXIncludeCtxt *ctxt, xmlResourceLoader loader, void *data) { if (ctxt == NULL) return; @@ -2022,7 +2022,7 @@ xmlXIncludeSetResourceLoader(xmlXIncludeCtxtPtr ctxt, * @returns 0 in case of success and -1 in case of error. */ int -xmlXIncludeSetFlags(xmlXIncludeCtxtPtr ctxt, int flags) { +xmlXIncludeSetFlags(xmlXIncludeCtxt *ctxt, int flags) { if (ctxt == NULL) return(-1); ctxt->parseFlags = flags; @@ -2037,7 +2037,7 @@ xmlXIncludeSetFlags(xmlXIncludeCtxtPtr ctxt, int flags) { * @returns 0 in case of success and -1 in case of error. */ int -xmlXIncludeSetStreamingMode(xmlXIncludeCtxtPtr ctxt, int mode) { +xmlXIncludeSetStreamingMode(xmlXIncludeCtxt *ctxt, int mode) { if (ctxt == NULL) return(-1); ctxt->isStream = !!mode; @@ -2056,7 +2056,7 @@ xmlXIncludeSetStreamingMode(xmlXIncludeCtxtPtr ctxt, int mode) { */ int -xmlXIncludeProcessTreeFlagsData(xmlNodePtr tree, int flags, void *data) { +xmlXIncludeProcessTreeFlagsData(xmlNode *tree, int flags, void *data) { xmlXIncludeCtxtPtr ctxt; int ret = 0; @@ -2088,7 +2088,7 @@ xmlXIncludeProcessTreeFlagsData(xmlNodePtr tree, int flags, void *data) { * or the number of substitutions done. */ int -xmlXIncludeProcessFlagsData(xmlDocPtr doc, int flags, void *data) { +xmlXIncludeProcessFlagsData(xmlDoc *doc, int flags, void *data) { xmlNodePtr tree; if (doc == NULL) @@ -2108,7 +2108,7 @@ xmlXIncludeProcessFlagsData(xmlDocPtr doc, int flags, void *data) { * or the number of substitutions done. */ int -xmlXIncludeProcessFlags(xmlDocPtr doc, int flags) { +xmlXIncludeProcessFlags(xmlDoc *doc, int flags) { return xmlXIncludeProcessFlagsData(doc, flags, NULL); } @@ -2120,7 +2120,7 @@ xmlXIncludeProcessFlags(xmlDocPtr doc, int flags) { * or the number of substitutions done. */ int -xmlXIncludeProcess(xmlDocPtr doc) { +xmlXIncludeProcess(xmlDoc *doc) { return(xmlXIncludeProcessFlags(doc, 0)); } @@ -2133,7 +2133,7 @@ xmlXIncludeProcess(xmlDocPtr doc) { * or the number of substitutions done. */ int -xmlXIncludeProcessTreeFlags(xmlNodePtr tree, int flags) { +xmlXIncludeProcessTreeFlags(xmlNode *tree, int flags) { xmlXIncludeCtxtPtr ctxt; int ret = 0; @@ -2160,7 +2160,7 @@ xmlXIncludeProcessTreeFlags(xmlNodePtr tree, int flags) { * or the number of substitutions done. */ int -xmlXIncludeProcessTree(xmlNodePtr tree) { +xmlXIncludeProcessTree(xmlNode *tree) { return(xmlXIncludeProcessTreeFlags(tree, 0)); } @@ -2174,7 +2174,7 @@ xmlXIncludeProcessTree(xmlNodePtr tree) { * or the number of substitutions done. */ int -xmlXIncludeProcessNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr node) { +xmlXIncludeProcessNode(xmlXIncludeCtxt *ctxt, xmlNode *node) { int ret = 0; if ((node == NULL) || (node->type == XML_NAMESPACE_DECL) || diff --git a/xlink.c b/xlink.c index 16ae3203..78c7d1a7 100644 --- a/xlink.c +++ b/xlink.c @@ -40,7 +40,7 @@ static xlinkNodeDetectFunc xlinkDefaultDetect = NULL; * * @returns the current xlinkHandlerPtr value. */ -xlinkHandlerPtr +xlinkHandler * xlinkGetDefaultHandler(void) { return(xlinkDefaultHandler); } @@ -54,7 +54,7 @@ xlinkGetDefaultHandler(void) { * @param handler the new value for the xlink handler block */ void -xlinkSetDefaultHandler(xlinkHandlerPtr handler) { +xlinkSetDefaultHandler(xlinkHandler *handler) { xlinkDefaultHandler = handler; } @@ -104,7 +104,7 @@ xlinkSetDefaultDetect (xlinkNodeDetectFunc func) { * link detected. */ xlinkType -xlinkIsLink (xmlDocPtr doc, xmlNodePtr node) { +xlinkIsLink (xmlDoc *doc, xmlNode *node) { xmlChar *type = NULL, *role = NULL; xlinkType ret = XLINK_TYPE_NONE; diff --git a/xmlIO.c b/xmlIO.c index b711f255..e03b8dd6 100644 --- a/xmlIO.c +++ b/xmlIO.c @@ -374,7 +374,7 @@ xmlEscapeText(const xmlChar *string, int flags) { #ifdef LIBXML_OUTPUT_ENABLED void -xmlSerializeText(xmlOutputBufferPtr buf, const xmlChar *string, size_t maxSize, +xmlSerializeText(xmlOutputBuffer *buf, const xmlChar *string, size_t maxSize, unsigned flags) { const xmlChar *cur; const signed char *tab; @@ -1267,7 +1267,7 @@ xmlIODefaultMatch(const char *filename ATTRIBUTE_UNUSED) { * @returns an xmlParserErrors code. */ xmlParserErrors -xmlInputFromFd(xmlParserInputBufferPtr buf, int fd, +xmlInputFromFd(xmlParserInputBuffer *buf, int fd, xmlParserInputFlags flags) { xmlFdIOCtxt *fdctxt; int copy; @@ -1471,7 +1471,7 @@ xmlOutputDefaultOpen(xmlOutputBufferPtr buf, const char *filename, * @param enc the charset encoding if known (deprecated) * @returns the new parser input or NULL */ -xmlParserInputBufferPtr +xmlParserInputBuffer * xmlAllocParserInputBuffer(xmlCharEncoding enc) { xmlParserInputBufferPtr ret; @@ -1514,8 +1514,8 @@ xmlAllocParserInputBuffer(xmlCharEncoding enc) { * @param encoder the encoding converter or NULL * @returns the new parser output or NULL */ -xmlOutputBufferPtr -xmlAllocOutputBuffer(xmlCharEncodingHandlerPtr encoder) { +xmlOutputBuffer * +xmlAllocOutputBuffer(xmlCharEncodingHandler *encoder) { xmlOutputBufferPtr ret; ret = (xmlOutputBufferPtr) xmlMalloc(sizeof(xmlOutputBuffer)); @@ -1559,7 +1559,7 @@ xmlAllocOutputBuffer(xmlCharEncodingHandlerPtr encoder) { * @param in a buffered parser input */ void -xmlFreeParserInputBuffer(xmlParserInputBufferPtr in) { +xmlFreeParserInputBuffer(xmlParserInputBuffer *in) { if (in == NULL) return; if (in->raw) { @@ -1590,7 +1590,7 @@ xmlFreeParserInputBuffer(xmlParserInputBufferPtr in) { * code in case of error. */ int -xmlOutputBufferClose(xmlOutputBufferPtr out) +xmlOutputBufferClose(xmlOutputBuffer *out) { int ret; @@ -1645,7 +1645,7 @@ xmlOutputBufferClose(xmlOutputBufferPtr out) xmlParserErrors xmlParserInputBufferCreateUrl(const char *URI, xmlCharEncoding enc, xmlParserInputFlags flags, - xmlParserInputBufferPtr *out) { + xmlParserInputBuffer **out) { xmlParserInputBufferPtr buf; xmlParserErrors ret; int i; @@ -1712,7 +1712,7 @@ xmlParserInputBufferCreateUrl(const char *URI, xmlCharEncoding enc, * @param enc the charset encoding if known * @returns the new parser input or NULL */ -xmlParserInputBufferPtr +xmlParserInputBuffer * __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) { xmlParserInputBufferPtr ret; @@ -1735,7 +1735,7 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) { * @param enc the charset encoding if known * @returns the new parser input or NULL */ -xmlParserInputBufferPtr +xmlParserInputBuffer * xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) { xmlParserInputBufferPtr ret; xmlParserErrors code; @@ -1777,9 +1777,9 @@ xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) { * @param compression the compression ration (0 none, 9 max). * @returns the new output or NULL */ -xmlOutputBufferPtr +xmlOutputBuffer * __xmlOutputBufferCreateFilename(const char *URI, - xmlCharEncodingHandlerPtr encoder, + xmlCharEncodingHandler *encoder, int compression) { xmlOutputBufferPtr ret = NULL; xmlURIPtr puri; @@ -1866,9 +1866,9 @@ error: * @param compression the compression ration (0 none, 9 max). * @returns the new output or NULL */ -xmlOutputBufferPtr +xmlOutputBuffer * xmlOutputBufferCreateFilename(const char *URI, - xmlCharEncodingHandlerPtr encoder, + xmlCharEncodingHandler *encoder, int compression ATTRIBUTE_UNUSED) { if ((xmlOutputBufferCreateFilenameValue)) { return xmlOutputBufferCreateFilenameValue(URI, encoder, compression); @@ -1891,7 +1891,7 @@ xmlOutputBufferCreateFilename(const char *URI, * @param enc the charset encoding if known (deprecated) * @returns the new parser input or NULL */ -xmlParserInputBufferPtr +xmlParserInputBuffer * xmlParserInputBufferCreateFile(FILE *file, xmlCharEncoding enc) { xmlParserInputBufferPtr ret; @@ -1918,8 +1918,8 @@ xmlParserInputBufferCreateFile(FILE *file, xmlCharEncoding enc) { * @param encoder the encoding converter or NULL * @returns the new parser output or NULL */ -xmlOutputBufferPtr -xmlOutputBufferCreateFile(FILE *file, xmlCharEncodingHandlerPtr encoder) { +xmlOutputBuffer * +xmlOutputBufferCreateFile(FILE *file, xmlCharEncodingHandler *encoder) { xmlOutputBufferPtr ret; if (file == NULL) { @@ -1945,9 +1945,9 @@ xmlOutputBufferCreateFile(FILE *file, xmlCharEncodingHandlerPtr encoder) { * @param encoder the encoding converter or NULL * @returns the new parser output or NULL */ -xmlOutputBufferPtr -xmlOutputBufferCreateBuffer(xmlBufferPtr buffer, - xmlCharEncodingHandlerPtr encoder) { +xmlOutputBuffer * +xmlOutputBufferCreateBuffer(xmlBuffer *buffer, + xmlCharEncodingHandler *encoder) { xmlOutputBufferPtr ret; if (buffer == NULL) { @@ -1967,7 +1967,7 @@ xmlOutputBufferCreateBuffer(xmlBufferPtr buffer, * @returns a pointer to the data or NULL in case of error */ const xmlChar * -xmlOutputBufferGetContent(xmlOutputBufferPtr out) { +xmlOutputBufferGetContent(xmlOutputBuffer *out) { if ((out == NULL) || (out->buffer == NULL) || (out->error != 0)) return(NULL); @@ -1981,7 +1981,7 @@ xmlOutputBufferGetContent(xmlOutputBufferPtr out) { * @returns 0 in case or error or no data is held, the size otherwise */ size_t -xmlOutputBufferGetSize(xmlOutputBufferPtr out) { +xmlOutputBufferGetSize(xmlOutputBuffer *out) { if ((out == NULL) || (out->buffer == NULL) || (out->error != 0)) return(0); @@ -2005,7 +2005,7 @@ xmlOutputBufferGetSize(xmlOutputBufferPtr out) { * @param enc the charset encoding if known (deprecated) * @returns the new parser input or NULL */ -xmlParserInputBufferPtr +xmlParserInputBuffer * xmlParserInputBufferCreateFd(int fd, xmlCharEncoding enc) { xmlParserInputBufferPtr ret; @@ -2065,7 +2065,7 @@ xmlMemClose(void *vctxt) { * @param enc the charset encoding if known (deprecated) * @returns the new input buffer or NULL. */ -xmlParserInputBufferPtr +xmlParserInputBuffer * xmlNewInputBufferMemory(const void *mem, size_t size, xmlParserInputFlags flags, xmlCharEncoding enc) { xmlParserInputBufferPtr ret; @@ -2131,7 +2131,7 @@ xmlNewInputBufferMemory(const void *mem, size_t size, * @param enc the charset encoding if known (deprecated) * @returns the new parser input or NULL in case of error. */ -xmlParserInputBufferPtr +xmlParserInputBuffer * xmlParserInputBufferCreateMem(const char *mem, int size, xmlCharEncoding enc) { if ((mem == NULL) || (size < 0)) return(NULL); @@ -2157,7 +2157,7 @@ xmlParserInputBufferCreateMem(const char *mem, int size, xmlCharEncoding enc) { * @param enc the charset encoding if known * @returns the new parser input or NULL in case of error. */ -xmlParserInputBufferPtr +xmlParserInputBuffer * xmlParserInputBufferCreateStatic(const char *mem, int size, xmlCharEncoding enc) { if ((mem == NULL) || (size < 0)) @@ -2175,7 +2175,7 @@ xmlParserInputBufferCreateStatic(const char *mem, int size, * @param flags flags * @returns the new input buffer or NULL. */ -xmlParserInputBufferPtr +xmlParserInputBuffer * xmlNewInputBufferString(const char *str, xmlParserInputFlags flags) { xmlParserInputBufferPtr ret; @@ -2206,8 +2206,8 @@ xmlNewInputBufferString(const char *str, xmlParserInputFlags flags) { * @param encoder the encoding converter or NULL * @returns the new parser output or NULL */ -xmlOutputBufferPtr -xmlOutputBufferCreateFd(int fd, xmlCharEncodingHandlerPtr encoder) { +xmlOutputBuffer * +xmlOutputBufferCreateFd(int fd, xmlCharEncodingHandler *encoder) { xmlOutputBufferPtr ret; if (fd < 0) { @@ -2249,7 +2249,7 @@ xmlOutputBufferCreateFd(int fd, xmlCharEncodingHandlerPtr encoder) { * @param enc the charset encoding if known (deprecated) * @returns the new parser input or NULL */ -xmlParserInputBufferPtr +xmlParserInputBuffer * xmlParserInputBufferCreateIO(xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void *ioctx, xmlCharEncoding enc) { xmlParserInputBufferPtr ret; @@ -2279,10 +2279,10 @@ xmlParserInputBufferCreateIO(xmlInputReadCallback ioread, * @param encoder the charset encoding if known * @returns the new parser output or NULL */ -xmlOutputBufferPtr +xmlOutputBuffer * xmlOutputBufferCreateIO(xmlOutputWriteCallback iowrite, xmlOutputCloseCallback ioclose, void *ioctx, - xmlCharEncodingHandlerPtr encoder) { + xmlCharEncodingHandler *encoder) { xmlOutputBufferPtr ret; if (iowrite == NULL) { @@ -2357,7 +2357,7 @@ xmlOutputBufferCreateFilenameDefault(xmlOutputBufferCreateFilenameFunc func) * in case of error. */ int -xmlParserInputBufferPush(xmlParserInputBufferPtr in, +xmlParserInputBufferPush(xmlParserInputBuffer *in, int len, const char *buf) { size_t nbchars = 0; int ret; @@ -2425,7 +2425,7 @@ endOfInput (void * context ATTRIBUTE_UNUSED, * in case of error. */ int -xmlParserInputBufferGrow(xmlParserInputBufferPtr in, int len) { +xmlParserInputBufferGrow(xmlParserInputBuffer *in, int len) { int res = 0; if ((in == NULL) || (in->error)) @@ -2512,7 +2512,7 @@ xmlParserInputBufferGrow(xmlParserInputBufferPtr in, int len) { * in case of error. */ int -xmlParserInputBufferRead(xmlParserInputBufferPtr in, int len) { +xmlParserInputBufferRead(xmlParserInputBuffer *in, int len) { return(xmlParserInputBufferGrow(in, len)); } @@ -2530,7 +2530,7 @@ xmlParserInputBufferRead(xmlParserInputBufferPtr in, int len) { * in case of error. */ int -xmlOutputBufferWrite(xmlOutputBufferPtr out, int len, const char *data) { +xmlOutputBufferWrite(xmlOutputBuffer *out, int len, const char *data) { xmlBufPtr buf = NULL; size_t written = 0; int ret; @@ -2630,7 +2630,7 @@ xmlOutputBufferWrite(xmlOutputBufferPtr out, int len, const char *data) { * in case of error. */ int -xmlOutputBufferWriteEscape(xmlOutputBufferPtr out, const xmlChar *str, +xmlOutputBufferWriteEscape(xmlOutputBuffer *out, const xmlChar *str, xmlCharEncodingOutputFunc escaping) { int ret; int written = 0; @@ -2702,7 +2702,7 @@ xmlOutputBufferWriteEscape(xmlOutputBufferPtr out, const xmlChar *str, * in case of error. */ int -xmlOutputBufferWriteString(xmlOutputBufferPtr out, const char *str) { +xmlOutputBufferWriteString(xmlOutputBuffer *out, const char *str) { int len; if ((out == NULL) || (out->error)) return(-1); @@ -2730,7 +2730,7 @@ xmlOutputBufferWriteString(xmlOutputBufferPtr out, const char *str) { * @param string the string to add */ void -xmlOutputBufferWriteQuotedString(xmlOutputBufferPtr buf, +xmlOutputBufferWriteQuotedString(xmlOutputBuffer *buf, const xmlChar *string) { const xmlChar *cur, *base; @@ -2777,7 +2777,7 @@ xmlOutputBufferWriteQuotedString(xmlOutputBufferPtr buf, * @returns the number of byte written or -1 in case of error. */ int -xmlOutputBufferFlush(xmlOutputBufferPtr out) { +xmlOutputBufferFlush(xmlOutputBuffer *out) { int nbchars = 0, ret = 0; if ((out == NULL) || (out->error)) return(-1); diff --git a/xmlmodule.c b/xmlmodule.c index 5b0e863b..134be45c 100644 --- a/xmlmodule.c +++ b/xmlmodule.c @@ -53,7 +53,7 @@ static int xmlModulePlatformSymbol(void *handle, const char *name, void **result * @param options a set of xmlModuleOption * @returns a handle for the module or NULL in case of error */ -xmlModulePtr +xmlModule * xmlModuleOpen(const char *name, int options ATTRIBUTE_UNUSED) { xmlModulePtr module; @@ -88,7 +88,7 @@ xmlModuleOpen(const char *name, int options ATTRIBUTE_UNUSED) * @returns 0 if the symbol was found, or -1 in case of error */ int -xmlModuleSymbol(xmlModulePtr module, const char *name, void **symbol) +xmlModuleSymbol(xmlModule *module, const char *name, void **symbol) { int rc = -1; @@ -112,7 +112,7 @@ xmlModuleSymbol(xmlModulePtr module, const char *name, void **symbol) * if the module could not be closed/unloaded. */ int -xmlModuleClose(xmlModulePtr module) +xmlModuleClose(xmlModule *module) { int rc; @@ -137,7 +137,7 @@ xmlModuleClose(xmlModulePtr module) * @returns 0 in case of success, -1 in case of argument error */ int -xmlModuleFree(xmlModulePtr module) +xmlModuleFree(xmlModule *module) { if (NULL == module) return -1; diff --git a/xmlreader.c b/xmlreader.c index eee8ca73..9c42134b 100644 --- a/xmlreader.c +++ b/xmlreader.c @@ -1198,7 +1198,7 @@ xmlTextReaderDoExpand(xmlTextReaderPtr reader) { * nodes to read, or -1 in case of error */ int -xmlTextReaderRead(xmlTextReaderPtr reader) { +xmlTextReaderRead(xmlTextReader *reader) { int val, olddepth = 0; xmlTextReaderState oldstate = XML_TEXTREADER_START; xmlNodePtr oldnode = NULL; @@ -1555,7 +1555,7 @@ node_end: * @returns the state value, or -1 in case of error */ int -xmlTextReaderReadState(xmlTextReaderPtr reader) { +xmlTextReaderReadState(xmlTextReader *reader) { if (reader == NULL) return(-1); return(reader->mode); @@ -1569,8 +1569,8 @@ xmlTextReaderReadState(xmlTextReaderPtr reader) { * @returns a node pointer valid until the next xmlTextReaderRead() call * or NULL in case of error. */ -xmlNodePtr -xmlTextReaderExpand(xmlTextReaderPtr reader) { +xmlNode * +xmlTextReaderExpand(xmlTextReader *reader) { if ((reader == NULL) || (reader->node == NULL)) return(NULL); if (reader->doc != NULL) @@ -1591,7 +1591,7 @@ xmlTextReaderExpand(xmlTextReaderPtr reader) { * nodes to read, or -1 in case of error */ int -xmlTextReaderNext(xmlTextReaderPtr reader) { +xmlTextReaderNext(xmlTextReader *reader) { int ret; xmlNodePtr cur; @@ -1655,7 +1655,7 @@ xmlTextReaderDumpCopy(xmlTextReaderPtr reader, xmlOutputBufferPtr output, * string must be deallocated by the caller. */ xmlChar * -xmlTextReaderReadInnerXml(xmlTextReaderPtr reader) +xmlTextReaderReadInnerXml(xmlTextReader *reader) { xmlOutputBufferPtr output; xmlNodePtr cur; @@ -1694,7 +1694,7 @@ xmlTextReaderReadInnerXml(xmlTextReaderPtr reader) * by the caller. */ xmlChar * -xmlTextReaderReadOuterXml(xmlTextReaderPtr reader) +xmlTextReaderReadOuterXml(xmlTextReader *reader) { xmlOutputBufferPtr output; xmlNodePtr node; @@ -1734,7 +1734,7 @@ xmlTextReaderReadOuterXml(xmlTextReaderPtr reader) * The string must be deallocated by the caller. */ xmlChar * -xmlTextReaderReadString(xmlTextReaderPtr reader) +xmlTextReaderReadString(xmlTextReader *reader) { xmlNodePtr node, cur; xmlBufPtr buf; @@ -1949,7 +1949,7 @@ found_node: * nodes to read, or -1 in case of error */ int -xmlTextReaderNextSibling(xmlTextReaderPtr reader) { +xmlTextReaderNextSibling(xmlTextReader *reader) { if (reader == NULL) return(-1); if (reader->doc == NULL) { @@ -1984,8 +1984,8 @@ xmlTextReaderNextSibling(xmlTextReaderPtr reader) { * @param URI the URI information for the source if available * @returns the new xmlTextReaderPtr or NULL in case of error */ -xmlTextReaderPtr -xmlNewTextReader(xmlParserInputBufferPtr input, const char *URI) { +xmlTextReader * +xmlNewTextReader(xmlParserInputBuffer *input, const char *URI) { xmlTextReaderPtr ret; if (input == NULL) @@ -2083,7 +2083,7 @@ xmlNewTextReader(xmlParserInputBufferPtr input, const char *URI) { * @param URI the URI of the resource to process * @returns the new xmlTextReaderPtr or NULL in case of error */ -xmlTextReaderPtr +xmlTextReader * xmlNewTextReaderFilename(const char *URI) { xmlParserInputBufferPtr input; xmlTextReaderPtr ret; @@ -2125,7 +2125,7 @@ xmlNewTextReaderFilename(const char *URI) { * @param reader the xmlTextReaderPtr */ void -xmlFreeTextReader(xmlTextReaderPtr reader) { +xmlFreeTextReader(xmlTextReader *reader) { if (reader == NULL) return; #ifdef LIBXML_RELAXNG_ENABLED @@ -2201,7 +2201,7 @@ xmlFreeTextReader(xmlTextReaderPtr reader) { * @returns 0 or -1 in case of error */ int -xmlTextReaderClose(xmlTextReaderPtr reader) { +xmlTextReaderClose(xmlTextReader *reader) { if (reader == NULL) return(-1); reader->node = NULL; @@ -2248,7 +2248,7 @@ xmlTextReaderClose(xmlTextReaderPtr reader) { * in case of error. The string must be deallocated by the caller. */ xmlChar * -xmlTextReaderGetAttributeNo(xmlTextReaderPtr reader, int no) { +xmlTextReaderGetAttributeNo(xmlTextReader *reader, int no) { xmlChar *ret; int i; xmlAttrPtr cur; @@ -2298,7 +2298,7 @@ xmlTextReaderGetAttributeNo(xmlTextReaderPtr reader, int no) { * in case of error. The string must be deallocated by the caller. */ xmlChar * -xmlTextReaderGetAttribute(xmlTextReaderPtr reader, const xmlChar *name) { +xmlTextReaderGetAttribute(xmlTextReader *reader, const xmlChar *name) { xmlChar *prefix = NULL; const xmlChar *localname; xmlNsPtr ns; @@ -2382,7 +2382,7 @@ xmlTextReaderGetAttribute(xmlTextReaderPtr reader, const xmlChar *name) { * in case of error. The string must be deallocated by the caller. */ xmlChar * -xmlTextReaderGetAttributeNs(xmlTextReaderPtr reader, const xmlChar *localName, +xmlTextReaderGetAttributeNs(xmlTextReader *reader, const xmlChar *localName, const xmlChar *namespaceURI) { xmlChar *ret = NULL; xmlChar *prefix = NULL; @@ -2435,8 +2435,8 @@ xmlTextReaderGetAttributeNs(xmlTextReaderPtr reader, const xmlChar *localName, * @returns the xmlParserInputBufferPtr attached to the XML or NULL * in case of error. */ -xmlParserInputBufferPtr -xmlTextReaderGetRemainder(xmlTextReaderPtr reader) { +xmlParserInputBuffer * +xmlTextReaderGetRemainder(xmlTextReader *reader) { xmlParserInputBufferPtr ret = NULL; if (reader == NULL) @@ -2481,7 +2481,7 @@ xmlTextReaderGetRemainder(xmlTextReaderPtr reader) { * or NULL in case of error. The string must be deallocated by the caller. */ xmlChar * -xmlTextReaderLookupNamespace(xmlTextReaderPtr reader, const xmlChar *prefix) { +xmlTextReaderLookupNamespace(xmlTextReader *reader, const xmlChar *prefix) { xmlNsPtr ns; int result; @@ -2510,7 +2510,7 @@ xmlTextReaderLookupNamespace(xmlTextReaderPtr reader, const xmlChar *prefix) { * @returns 1 in case of success, -1 in case of error, 0 if not found */ int -xmlTextReaderMoveToAttributeNo(xmlTextReaderPtr reader, int no) { +xmlTextReaderMoveToAttributeNo(xmlTextReader *reader, int no) { int i; xmlAttrPtr cur; xmlNsPtr ns; @@ -2557,7 +2557,7 @@ xmlTextReaderMoveToAttributeNo(xmlTextReaderPtr reader, int no) { * @returns 1 in case of success, -1 in case of error, 0 if not found */ int -xmlTextReaderMoveToAttribute(xmlTextReaderPtr reader, const xmlChar *name) { +xmlTextReaderMoveToAttribute(xmlTextReader *reader, const xmlChar *name) { xmlChar *prefix = NULL; const xmlChar *localname; xmlNsPtr ns; @@ -2659,7 +2659,7 @@ found: * @returns 1 in case of success, -1 in case of error, 0 if not found */ int -xmlTextReaderMoveToAttributeNs(xmlTextReaderPtr reader, +xmlTextReaderMoveToAttributeNs(xmlTextReader *reader, const xmlChar *localName, const xmlChar *namespaceURI) { xmlAttrPtr prop; xmlNodePtr node; @@ -2716,7 +2716,7 @@ xmlTextReaderMoveToAttributeNs(xmlTextReaderPtr reader, * @returns 1 in case of success, -1 in case of error, 0 if not found */ int -xmlTextReaderMoveToFirstAttribute(xmlTextReaderPtr reader) { +xmlTextReaderMoveToFirstAttribute(xmlTextReader *reader) { if (reader == NULL) return(-1); if (reader->node == NULL) @@ -2743,7 +2743,7 @@ xmlTextReaderMoveToFirstAttribute(xmlTextReaderPtr reader) { * @returns 1 in case of success, -1 in case of error, 0 if not found */ int -xmlTextReaderMoveToNextAttribute(xmlTextReaderPtr reader) { +xmlTextReaderMoveToNextAttribute(xmlTextReader *reader) { if (reader == NULL) return(-1); if (reader->node == NULL) @@ -2780,7 +2780,7 @@ xmlTextReaderMoveToNextAttribute(xmlTextReaderPtr reader) { * @returns 1 in case of success, -1 in case of error, 0 if not moved */ int -xmlTextReaderMoveToElement(xmlTextReaderPtr reader) { +xmlTextReaderMoveToElement(xmlTextReader *reader) { if (reader == NULL) return(-1); if (reader->node == NULL) @@ -2803,7 +2803,7 @@ xmlTextReaderMoveToElement(xmlTextReaderPtr reader) { * in case of error. */ int -xmlTextReaderReadAttributeValue(xmlTextReaderPtr reader) { +xmlTextReaderReadAttributeValue(xmlTextReader *reader) { if (reader == NULL) return(-1); if (reader->node == NULL) @@ -2856,7 +2856,7 @@ xmlTextReaderReadAttributeValue(xmlTextReaderPtr reader) { * case of error. The string is deallocated with the reader. */ const xmlChar * -xmlTextReaderConstEncoding(xmlTextReaderPtr reader) { +xmlTextReaderConstEncoding(xmlTextReader *reader) { const xmlChar *encoding = NULL; if (reader == NULL) @@ -2883,7 +2883,7 @@ xmlTextReaderConstEncoding(xmlTextReaderPtr reader) { * @returns 0 i no attributes, -1 in case of error or the attribute count */ int -xmlTextReaderAttributeCount(xmlTextReaderPtr reader) { +xmlTextReaderAttributeCount(xmlTextReader *reader) { int ret; xmlAttrPtr attr; xmlNsPtr ns; @@ -2927,7 +2927,7 @@ xmlTextReaderAttributeCount(xmlTextReaderPtr reader) { * @returns the xmlReaderTypes of the current node or -1 in case of error */ int -xmlTextReaderNodeType(xmlTextReaderPtr reader) { +xmlTextReaderNodeType(xmlTextReader *reader) { xmlNodePtr node; if (reader == NULL) @@ -2994,7 +2994,7 @@ xmlTextReaderNodeType(xmlTextReaderPtr reader) { * @returns 1 if empty, 0 if not and -1 in case of error */ int -xmlTextReaderIsEmptyElement(xmlTextReaderPtr reader) { +xmlTextReaderIsEmptyElement(xmlTextReader *reader) { if ((reader == NULL) || (reader->node == NULL)) return(-1); if (reader->node->type != XML_ELEMENT_NODE) @@ -3022,7 +3022,7 @@ xmlTextReaderIsEmptyElement(xmlTextReaderPtr reader) { * if non NULL it need to be freed by the caller. */ xmlChar * -xmlTextReaderLocalName(xmlTextReaderPtr reader) { +xmlTextReaderLocalName(xmlTextReader *reader) { xmlNodePtr node; if ((reader == NULL) || (reader->node == NULL)) return(NULL); @@ -3051,7 +3051,7 @@ xmlTextReaderLocalName(xmlTextReaderPtr reader) { * string will be deallocated with the reader. */ const xmlChar * -xmlTextReaderConstLocalName(xmlTextReaderPtr reader) { +xmlTextReaderConstLocalName(xmlTextReader *reader) { xmlNodePtr node; if ((reader == NULL) || (reader->node == NULL)) return(NULL); @@ -3080,7 +3080,7 @@ xmlTextReaderConstLocalName(xmlTextReaderPtr reader) { * if non NULL it need to be freed by the caller. */ xmlChar * -xmlTextReaderName(xmlTextReaderPtr reader) { +xmlTextReaderName(xmlTextReader *reader) { xmlNodePtr node; xmlChar *ret; @@ -3151,7 +3151,7 @@ xmlTextReaderName(xmlTextReaderPtr reader) { * deallocated with the reader. */ const xmlChar * -xmlTextReaderConstName(xmlTextReaderPtr reader) { +xmlTextReaderConstName(xmlTextReader *reader) { xmlNodePtr node; if ((reader == NULL) || (reader->node == NULL)) @@ -3214,7 +3214,7 @@ xmlTextReaderConstName(xmlTextReaderPtr reader) { * if non NULL it need to be freed by the caller. */ xmlChar * -xmlTextReaderPrefix(xmlTextReaderPtr reader) { +xmlTextReaderPrefix(xmlTextReader *reader) { xmlNodePtr node; if ((reader == NULL) || (reader->node == NULL)) return(NULL); @@ -3244,7 +3244,7 @@ xmlTextReaderPrefix(xmlTextReaderPtr reader) { * with the reader. */ const xmlChar * -xmlTextReaderConstPrefix(xmlTextReaderPtr reader) { +xmlTextReaderConstPrefix(xmlTextReader *reader) { xmlNodePtr node; if ((reader == NULL) || (reader->node == NULL)) return(NULL); @@ -3274,7 +3274,7 @@ xmlTextReaderConstPrefix(xmlTextReaderPtr reader) { * if non NULL it need to be freed by the caller. */ xmlChar * -xmlTextReaderNamespaceUri(xmlTextReaderPtr reader) { +xmlTextReaderNamespaceUri(xmlTextReader *reader) { xmlNodePtr node; if ((reader == NULL) || (reader->node == NULL)) return(NULL); @@ -3300,7 +3300,7 @@ xmlTextReaderNamespaceUri(xmlTextReaderPtr reader) { * will be deallocated with the reader */ const xmlChar * -xmlTextReaderConstNamespaceUri(xmlTextReaderPtr reader) { +xmlTextReaderConstNamespaceUri(xmlTextReader *reader) { xmlNodePtr node; if ((reader == NULL) || (reader->node == NULL)) return(NULL); @@ -3326,7 +3326,7 @@ xmlTextReaderConstNamespaceUri(xmlTextReaderPtr reader) { * if non NULL it need to be freed by the caller. */ xmlChar * -xmlTextReaderBaseUri(xmlTextReaderPtr reader) { +xmlTextReaderBaseUri(xmlTextReader *reader) { xmlChar *ret = NULL; int result; @@ -3347,7 +3347,7 @@ xmlTextReaderBaseUri(xmlTextReaderPtr reader) { * will be deallocated with the reader */ const xmlChar * -xmlTextReaderConstBaseUri(xmlTextReaderPtr reader) { +xmlTextReaderConstBaseUri(xmlTextReader *reader) { xmlChar *tmp; const xmlChar *ret; int result; @@ -3371,7 +3371,7 @@ xmlTextReaderConstBaseUri(xmlTextReaderPtr reader) { * @returns the depth or -1 in case of error */ int -xmlTextReaderDepth(xmlTextReaderPtr reader) { +xmlTextReaderDepth(xmlTextReader *reader) { if (reader == NULL) return(-1); if (reader->node == NULL) @@ -3393,7 +3393,7 @@ xmlTextReaderDepth(xmlTextReaderPtr reader) { * @returns 1 if true, 0 if false, and -1 in case or error */ int -xmlTextReaderHasAttributes(xmlTextReaderPtr reader) { +xmlTextReaderHasAttributes(xmlTextReader *reader) { xmlNodePtr node; if (reader == NULL) return(-1); @@ -3418,7 +3418,7 @@ xmlTextReaderHasAttributes(xmlTextReaderPtr reader) { * @returns 1 if true, 0 if false, and -1 in case or error */ int -xmlTextReaderHasValue(xmlTextReaderPtr reader) { +xmlTextReaderHasValue(xmlTextReader *reader) { xmlNodePtr node; if (reader == NULL) return(-1); @@ -3451,7 +3451,7 @@ xmlTextReaderHasValue(xmlTextReaderPtr reader) { * with xmlFree() */ xmlChar * -xmlTextReaderValue(xmlTextReaderPtr reader) { +xmlTextReaderValue(xmlTextReader *reader) { xmlNodePtr node; if (reader == NULL) return(NULL); @@ -3498,7 +3498,7 @@ xmlTextReaderValue(xmlTextReaderPtr reader) { * deallocated on the next Read() operation. */ const xmlChar * -xmlTextReaderConstValue(xmlTextReaderPtr reader) { +xmlTextReaderConstValue(xmlTextReader *reader) { xmlNodePtr node; if (reader == NULL) return(NULL); @@ -3558,7 +3558,7 @@ xmlTextReaderConstValue(xmlTextReaderPtr reader) { * @returns 0 if not defaulted, 1 if defaulted, and -1 in case of error */ int -xmlTextReaderIsDefault(xmlTextReaderPtr reader) { +xmlTextReaderIsDefault(xmlTextReader *reader) { if (reader == NULL) return(-1); return(0); @@ -3571,7 +3571,7 @@ xmlTextReaderIsDefault(xmlTextReaderPtr reader) { * @returns " or ' and -1 in case of error */ int -xmlTextReaderQuoteChar(xmlTextReaderPtr reader) { +xmlTextReaderQuoteChar(xmlTextReader *reader) { if (reader == NULL) return(-1); /* TODO maybe lookup the attribute value for " first */ @@ -3586,7 +3586,7 @@ xmlTextReaderQuoteChar(xmlTextReaderPtr reader) { * if non NULL it need to be freed by the caller. */ xmlChar * -xmlTextReaderXmlLang(xmlTextReaderPtr reader) { +xmlTextReaderXmlLang(xmlTextReader *reader) { if (reader == NULL) return(NULL); if (reader->node == NULL) @@ -3601,7 +3601,7 @@ xmlTextReaderXmlLang(xmlTextReaderPtr reader) { * @returns the xml:lang value or NULL if none exists. */ const xmlChar * -xmlTextReaderConstXmlLang(xmlTextReaderPtr reader) { +xmlTextReaderConstXmlLang(xmlTextReader *reader) { xmlChar *tmp; const xmlChar *ret; @@ -3627,7 +3627,7 @@ xmlTextReaderConstXmlLang(xmlTextReaderPtr reader) { * string will be deallocated with the reader. */ const xmlChar * -xmlTextReaderConstString(xmlTextReaderPtr reader, const xmlChar *str) { +xmlTextReaderConstString(xmlTextReader *reader, const xmlChar *str) { if (reader == NULL) return(NULL); return(constString(reader, str)); @@ -3644,7 +3644,7 @@ xmlTextReaderConstString(xmlTextReaderPtr reader, const xmlChar *str) { * @returns 1 or -1 in case of error. */ int -xmlTextReaderNormalization(xmlTextReaderPtr reader) { +xmlTextReaderNormalization(xmlTextReader *reader) { if (reader == NULL) return(-1); return(1); @@ -3667,7 +3667,7 @@ xmlTextReaderNormalization(xmlTextReaderPtr reader) { * @returns 0 if the call was successful, or -1 in case of error */ int -xmlTextReaderSetParserProp(xmlTextReaderPtr reader, int prop, int value) { +xmlTextReaderSetParserProp(xmlTextReader *reader, int prop, int value) { xmlParserProperties p = (xmlParserProperties) prop; xmlParserCtxtPtr ctxt; @@ -3729,7 +3729,7 @@ xmlTextReaderSetParserProp(xmlTextReaderPtr reader, int prop, int value) { * @returns the value, usually 0 or 1, or -1 in case of error. */ int -xmlTextReaderGetParserProp(xmlTextReaderPtr reader, int prop) { +xmlTextReaderGetParserProp(xmlTextReader *reader, int prop) { xmlParserProperties p = (xmlParserProperties) prop; xmlParserCtxtPtr ctxt; @@ -3762,7 +3762,7 @@ xmlTextReaderGetParserProp(xmlTextReaderPtr reader, int prop) { * @returns an int or 0 if not available */ int -xmlTextReaderGetParserLineNumber(xmlTextReaderPtr reader) +xmlTextReaderGetParserLineNumber(xmlTextReader *reader) { if ((reader == NULL) || (reader->ctxt == NULL) || (reader->ctxt->input == NULL)) { @@ -3778,7 +3778,7 @@ xmlTextReaderGetParserLineNumber(xmlTextReaderPtr reader) * @returns an int or 0 if not available */ int -xmlTextReaderGetParserColumnNumber(xmlTextReaderPtr reader) +xmlTextReaderGetParserColumnNumber(xmlTextReader *reader) { if ((reader == NULL) || (reader->ctxt == NULL) || (reader->ctxt->input == NULL)) { @@ -3795,8 +3795,8 @@ xmlTextReaderGetParserColumnNumber(xmlTextReaderPtr reader) * @param reader the xmlTextReaderPtr used * @returns the xmlNodePtr or NULL in case of error. */ -xmlNodePtr -xmlTextReaderCurrentNode(xmlTextReaderPtr reader) { +xmlNode * +xmlTextReaderCurrentNode(xmlTextReader *reader) { if (reader == NULL) return(NULL); @@ -3813,8 +3813,8 @@ xmlTextReaderCurrentNode(xmlTextReaderPtr reader) { * @param reader the xmlTextReaderPtr used * @returns the xmlNodePtr or NULL in case of error. */ -xmlNodePtr -xmlTextReaderPreserve(xmlTextReaderPtr reader) { +xmlNode * +xmlTextReaderPreserve(xmlTextReader *reader) { xmlNodePtr cur, parent; if (reader == NULL) @@ -3851,7 +3851,7 @@ xmlTextReaderPreserve(xmlTextReaderPtr reader) { * @returns a non-negative number in case of success and -1 in case of error */ int -xmlTextReaderPreservePattern(xmlTextReaderPtr reader, const xmlChar *pattern, +xmlTextReaderPreservePattern(xmlTextReader *reader, const xmlChar *pattern, const xmlChar **namespaces) { xmlPatternPtr comp; @@ -3896,8 +3896,8 @@ xmlTextReaderPreservePattern(xmlTextReaderPtr reader, const xmlChar *pattern, * @param reader the xmlTextReaderPtr used * @returns the xmlDocPtr or NULL in case of error. */ -xmlDocPtr -xmlTextReaderCurrentDoc(xmlTextReaderPtr reader) { +xmlDoc * +xmlTextReaderCurrentDoc(xmlTextReader *reader) { if (reader == NULL) return(NULL); if (reader->doc != NULL) @@ -3923,7 +3923,7 @@ xmlTextReaderCurrentDoc(xmlTextReaderPtr reader) { * -1 in case of error. */ int -xmlTextReaderRelaxNGSetSchema(xmlTextReaderPtr reader, xmlRelaxNGPtr schema) { +xmlTextReaderRelaxNGSetSchema(xmlTextReader *reader, xmlRelaxNG *schema) { if (reader == NULL) return(-1); if (schema == NULL) { @@ -4030,7 +4030,7 @@ xmlTextReaderLocator(void *ctx, const char **file, unsigned long *line) { * -1 in case of error. */ int -xmlTextReaderSetSchema(xmlTextReaderPtr reader, xmlSchemaPtr schema) { +xmlTextReaderSetSchema(xmlTextReader *reader, xmlSchema *schema) { if (reader == NULL) return(-1); if (schema == NULL) { @@ -4303,8 +4303,8 @@ xmlTextReaderSchemaValidateInternal(xmlTextReaderPtr reader, * -1 in case of error. */ int -xmlTextReaderSchemaValidateCtxt(xmlTextReaderPtr reader, - xmlSchemaValidCtxtPtr ctxt, +xmlTextReaderSchemaValidateCtxt(xmlTextReader *reader, + xmlSchemaValidCtxt *ctxt, int options) { return(xmlTextReaderSchemaValidateInternal(reader, NULL, ctxt, options)); @@ -4321,7 +4321,7 @@ xmlTextReaderSchemaValidateCtxt(xmlTextReaderPtr reader, * -1 in case of error. */ int -xmlTextReaderSchemaValidate(xmlTextReaderPtr reader, const char *xsd) +xmlTextReaderSchemaValidate(xmlTextReader *reader, const char *xsd) { return(xmlTextReaderSchemaValidateInternal(reader, xsd, NULL, 0)); } @@ -4340,8 +4340,8 @@ xmlTextReaderSchemaValidate(xmlTextReaderPtr reader, const char *xsd) * -1 in case of error. */ int -xmlTextReaderRelaxNGValidateCtxt(xmlTextReaderPtr reader, - xmlRelaxNGValidCtxtPtr ctxt, +xmlTextReaderRelaxNGValidateCtxt(xmlTextReader *reader, + xmlRelaxNGValidCtxt *ctxt, int options) { return(xmlTextReaderRelaxNGValidateInternal(reader, NULL, ctxt, options)); @@ -4358,7 +4358,7 @@ xmlTextReaderRelaxNGValidateCtxt(xmlTextReaderPtr reader, * -1 in case of error. */ int -xmlTextReaderRelaxNGValidate(xmlTextReaderPtr reader, const char *rng) +xmlTextReaderRelaxNGValidate(xmlTextReader *reader, const char *rng) { return(xmlTextReaderRelaxNGValidateInternal(reader, rng, NULL, 0)); } @@ -4374,7 +4374,7 @@ xmlTextReaderRelaxNGValidate(xmlTextReaderPtr reader, const char *rng) * error. */ int -xmlTextReaderIsNamespaceDecl(xmlTextReaderPtr reader) { +xmlTextReaderIsNamespaceDecl(xmlTextReader *reader) { xmlNodePtr node; if (reader == NULL) return(-1); @@ -4399,7 +4399,7 @@ xmlTextReaderIsNamespaceDecl(xmlTextReaderPtr reader) { * in case of error. The string is deallocated with the reader. */ const xmlChar * -xmlTextReaderConstXmlVersion(xmlTextReaderPtr reader) { +xmlTextReaderConstXmlVersion(xmlTextReader *reader) { xmlDocPtr doc = NULL; if (reader == NULL) return(NULL); @@ -4425,7 +4425,7 @@ xmlTextReaderConstXmlVersion(xmlTextReaderPtr reader) { * specify its standalone status or in case of error. */ int -xmlTextReaderStandalone(xmlTextReaderPtr reader) { +xmlTextReaderStandalone(xmlTextReader *reader) { xmlDocPtr doc = NULL; if (reader == NULL) return(-1); @@ -4526,7 +4526,7 @@ xmlTextReaderLocatorBaseURI(xmlTextReaderLocatorPtr locator) { * @param arg a user argument to pass to the callback function */ void -xmlTextReaderSetErrorHandler(xmlTextReaderPtr reader, +xmlTextReaderSetErrorHandler(xmlTextReader *reader, xmlTextReaderErrorFunc f, void *arg) { if (reader == NULL) @@ -4583,7 +4583,7 @@ xmlTextReaderSetErrorHandler(xmlTextReaderPtr reader, * @param arg a user argument to pass to the callback function */ void -xmlTextReaderSetStructuredErrorHandler(xmlTextReaderPtr reader, +xmlTextReaderSetStructuredErrorHandler(xmlTextReader *reader, xmlStructuredErrorFunc f, void *arg) { if (reader == NULL) @@ -4636,7 +4636,7 @@ xmlTextReaderSetStructuredErrorHandler(xmlTextReaderPtr reader, * @param arg a user argument */ void -xmlTextReaderGetErrorHandler(xmlTextReaderPtr reader, +xmlTextReaderGetErrorHandler(xmlTextReader *reader, xmlTextReaderErrorFunc * f, void **arg) { if (f != NULL) @@ -4655,7 +4655,7 @@ xmlTextReaderGetErrorHandler(xmlTextReaderPtr reader, * @param data user data which will be passed to the loader */ void -xmlTextReaderSetResourceLoader(xmlTextReaderPtr reader, +xmlTextReaderSetResourceLoader(xmlTextReader *reader, xmlResourceLoader loader, void *data) { if ((reader == NULL) || (reader->ctxt == NULL)) return; @@ -4673,7 +4673,7 @@ xmlTextReaderSetResourceLoader(xmlTextReaderPtr reader, * @returns the flag value 1 if valid, 0 if no, and -1 in case of error */ int -xmlTextReaderIsValid(xmlTextReaderPtr reader) +xmlTextReaderIsValid(xmlTextReader *reader) { if (reader == NULL) return (-1); @@ -4708,8 +4708,8 @@ xmlTextReaderIsValid(xmlTextReaderPtr reader) * @returns 0 in case of success and -1 in case of error. */ int -xmlTextReaderSetup(xmlTextReaderPtr reader, - xmlParserInputBufferPtr input, const char *URL, +xmlTextReaderSetup(xmlTextReader *reader, + xmlParserInputBuffer *input, const char *URL, const char *encoding, int options) { if (reader == NULL) { @@ -4900,7 +4900,7 @@ xmlTextReaderSetup(xmlTextReaderPtr reader, * @param maxAmpl maximum amplification factor */ void -xmlTextReaderSetMaxAmplification(xmlTextReaderPtr reader, unsigned maxAmpl) +xmlTextReaderSetMaxAmplification(xmlTextReader *reader, unsigned maxAmpl) { if (reader == NULL) return; @@ -4914,7 +4914,7 @@ xmlTextReaderSetMaxAmplification(xmlTextReaderPtr reader, unsigned maxAmpl) * @returns the last error. */ const xmlError * -xmlTextReaderGetLastError(xmlTextReaderPtr reader) +xmlTextReaderGetLastError(xmlTextReader *reader) { if ((reader == NULL) || (reader->ctxt == NULL)) return(NULL); @@ -4937,7 +4937,7 @@ xmlTextReaderGetLastError(xmlTextReaderPtr reader) * in case the index could not be computed. */ long -xmlTextReaderByteConsumed(xmlTextReaderPtr reader) { +xmlTextReaderByteConsumed(xmlTextReader *reader) { xmlParserInputPtr in; if ((reader == NULL) || (reader->ctxt == NULL)) @@ -4955,8 +4955,8 @@ xmlTextReaderByteConsumed(xmlTextReaderPtr reader) { * @param doc a preparsed document * @returns the new reader or NULL in case of error. */ -xmlTextReaderPtr -xmlReaderWalker(xmlDocPtr doc) +xmlTextReader * +xmlReaderWalker(xmlDoc *doc) { xmlTextReaderPtr ret; @@ -4992,7 +4992,7 @@ xmlReaderWalker(xmlDocPtr doc) * @param options a combination of xmlParserOption * @returns the new reader or NULL in case of error. */ -xmlTextReaderPtr +xmlTextReader * xmlReaderForDoc(const xmlChar * cur, const char *URL, const char *encoding, int options) { @@ -5015,7 +5015,7 @@ xmlReaderForDoc(const xmlChar * cur, const char *URL, const char *encoding, * @param options a combination of xmlParserOption * @returns the new reader or NULL in case of error. */ -xmlTextReaderPtr +xmlTextReader * xmlReaderForFile(const char *filename, const char *encoding, int options) { xmlTextReaderPtr reader; @@ -5041,7 +5041,7 @@ xmlReaderForFile(const char *filename, const char *encoding, int options) * @param options a combination of xmlParserOption * @returns the new reader or NULL in case of error. */ -xmlTextReaderPtr +xmlTextReader * xmlReaderForMemory(const char *buffer, int size, const char *URL, const char *encoding, int options) { @@ -5077,7 +5077,7 @@ xmlReaderForMemory(const char *buffer, int size, const char *URL, * @param options a combination of xmlParserOption * @returns the new reader or NULL in case of error. */ -xmlTextReaderPtr +xmlTextReader * xmlReaderForFd(int fd, const char *URL, const char *encoding, int options) { xmlTextReaderPtr reader; @@ -5131,7 +5131,7 @@ xmlReaderForFd(int fd, const char *URL, const char *encoding, int options) * @param options a combination of xmlParserOption * @returns the new reader or NULL in case of error. */ -xmlTextReaderPtr +xmlTextReader * xmlReaderForIO(xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void *ioctx, const char *URL, const char *encoding, int options) @@ -5171,7 +5171,7 @@ xmlReaderForIO(xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, * @returns 0 in case of success and -1 in case of error */ int -xmlReaderNewWalker(xmlTextReaderPtr reader, xmlDocPtr doc) +xmlReaderNewWalker(xmlTextReader *reader, xmlDoc *doc) { if (doc == NULL) return (-1); @@ -5217,7 +5217,7 @@ xmlReaderNewWalker(xmlTextReaderPtr reader, xmlDocPtr doc) * @returns 0 in case of success and -1 in case of error */ int -xmlReaderNewDoc(xmlTextReaderPtr reader, const xmlChar * cur, +xmlReaderNewDoc(xmlTextReader *reader, const xmlChar * cur, const char *URL, const char *encoding, int options) { @@ -5245,7 +5245,7 @@ xmlReaderNewDoc(xmlTextReaderPtr reader, const xmlChar * cur, * @returns 0 in case of success and -1 in case of error */ int -xmlReaderNewFile(xmlTextReaderPtr reader, const char *filename, +xmlReaderNewFile(xmlTextReader *reader, const char *filename, const char *encoding, int options) { xmlParserInputBufferPtr input; @@ -5302,7 +5302,7 @@ xmlReaderNewFile(xmlTextReaderPtr reader, const char *filename, * @returns 0 in case of success and -1 in case of error */ int -xmlReaderNewMemory(xmlTextReaderPtr reader, const char *buffer, int size, +xmlReaderNewMemory(xmlTextReader *reader, const char *buffer, int size, const char *URL, const char *encoding, int options) { xmlParserInputBufferPtr input; @@ -5335,7 +5335,7 @@ xmlReaderNewMemory(xmlTextReaderPtr reader, const char *buffer, int size, * @returns 0 in case of success and -1 in case of error */ int -xmlReaderNewFd(xmlTextReaderPtr reader, int fd, +xmlReaderNewFd(xmlTextReader *reader, int fd, const char *URL, const char *encoding, int options) { xmlParserInputBufferPtr input; @@ -5385,7 +5385,7 @@ xmlReaderNewFd(xmlTextReaderPtr reader, int fd, * @returns 0 in case of success and -1 in case of error */ int -xmlReaderNewIO(xmlTextReaderPtr reader, xmlInputReadCallback ioread, +xmlReaderNewIO(xmlTextReader *reader, xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void *ioctx, const char *URL, const char *encoding, int options) { diff --git a/xmlregexp.c b/xmlregexp.c index b00dd94a..b0198c06 100644 --- a/xmlregexp.c +++ b/xmlregexp.c @@ -3542,8 +3542,8 @@ error: * @param data the context data associated to the callback in this context * @returns the new context */ -xmlRegExecCtxtPtr -xmlRegNewExecCtxt(xmlRegexpPtr comp, xmlRegExecCallbacks callback, void *data) { +xmlRegExecCtxt * +xmlRegNewExecCtxt(xmlRegexp *comp, xmlRegExecCallbacks callback, void *data) { xmlRegExecCtxtPtr exec; if (comp == NULL) @@ -3600,7 +3600,7 @@ xmlRegNewExecCtxt(xmlRegexpPtr comp, xmlRegExecCallbacks callback, void *data) { * @param exec a regular expression evaluation context */ void -xmlRegFreeExecCtxt(xmlRegExecCtxtPtr exec) { +xmlRegFreeExecCtxt(xmlRegExecCtxt *exec) { if (exec == NULL) return; @@ -4120,7 +4120,7 @@ progress: * a negative value in case of error. */ int -xmlRegExecPushString(xmlRegExecCtxtPtr exec, const xmlChar *value, +xmlRegExecPushString(xmlRegExecCtxt *exec, const xmlChar *value, void *data) { return(xmlRegExecPushStringInternal(exec, value, data, 0)); } @@ -4136,7 +4136,7 @@ xmlRegExecPushString(xmlRegExecCtxtPtr exec, const xmlChar *value, * a negative value in case of error. */ int -xmlRegExecPushString2(xmlRegExecCtxtPtr exec, const xmlChar *value, +xmlRegExecPushString2(xmlRegExecCtxt *exec, const xmlChar *value, const xmlChar *value2, void *data) { xmlChar buf[150]; int lenn, lenp, ret; @@ -4351,7 +4351,7 @@ xmlRegExecGetValues(xmlRegExecCtxtPtr exec, int err, * @returns 0 in case of success or -1 in case of error. */ int -xmlRegExecNextValues(xmlRegExecCtxtPtr exec, int *nbval, int *nbneg, +xmlRegExecNextValues(xmlRegExecCtxt *exec, int *nbval, int *nbneg, xmlChar **values, int *terminal) { return(xmlRegExecGetValues(exec, 0, nbval, nbneg, values, terminal)); } @@ -4374,7 +4374,7 @@ xmlRegExecNextValues(xmlRegExecCtxtPtr exec, int *nbval, int *nbneg, * @returns 0 in case of success or -1 in case of error. */ int -xmlRegExecErrInfo(xmlRegExecCtxtPtr exec, const xmlChar **string, +xmlRegExecErrInfo(xmlRegExecCtxt *exec, const xmlChar **string, int *nbval, int *nbneg, xmlChar **values, int *terminal) { if (exec == NULL) return(-1); @@ -5330,7 +5330,7 @@ xmlFAParseRegExp(xmlRegParserCtxtPtr ctxt, int top) { */ void xmlRegexpPrint(FILE *output ATTRIBUTE_UNUSED, - xmlRegexpPtr regexp ATTRIBUTE_UNUSED) { + xmlRegexp *regexp ATTRIBUTE_UNUSED) { } /** @@ -5341,7 +5341,7 @@ xmlRegexpPrint(FILE *output ATTRIBUTE_UNUSED, * @param regexp a regular expression string * @returns the compiled expression or NULL in case of error */ -xmlRegexpPtr +xmlRegexp * xmlRegexpCompile(const xmlChar *regexp) { xmlRegexpPtr ret = NULL; xmlRegParserCtxtPtr ctxt; @@ -5392,7 +5392,7 @@ error: * @returns 1 if it matches, 0 if not and a negative value in case of error */ int -xmlRegexpExec(xmlRegexpPtr comp, const xmlChar *content) { +xmlRegexpExec(xmlRegexp *comp, const xmlChar *content) { if ((comp == NULL) || (content == NULL)) return(-1); return(xmlFARegExec(comp, content)); @@ -5405,7 +5405,7 @@ xmlRegexpExec(xmlRegexpPtr comp, const xmlChar *content) { * @returns 1 if it yes, 0 if not and a negative value in case of error */ int -xmlRegexpIsDeterminist(xmlRegexpPtr comp) { +xmlRegexpIsDeterminist(xmlRegexp *comp) { xmlAutomataPtr am; int ret; @@ -5444,7 +5444,7 @@ xmlRegexpIsDeterminist(xmlRegexpPtr comp) { * @param regexp the regexp */ void -xmlRegFreeRegexp(xmlRegexpPtr regexp) { +xmlRegFreeRegexp(xmlRegexp *regexp) { int i; if (regexp == NULL) return; @@ -5487,7 +5487,7 @@ xmlRegFreeRegexp(xmlRegexpPtr regexp) { * * @returns the new object or NULL in case of failure */ -xmlAutomataPtr +xmlAutomata * xmlNewAutomata(void) { xmlAutomataPtr ctxt; @@ -5516,7 +5516,7 @@ xmlNewAutomata(void) { * @param am an automata */ void -xmlFreeAutomata(xmlAutomataPtr am) { +xmlFreeAutomata(xmlAutomata *am) { if (am == NULL) return; xmlRegFreeParserCtxt(am); @@ -5529,7 +5529,7 @@ xmlFreeAutomata(xmlAutomataPtr am) { * @param flags a set of internal flags */ void -xmlAutomataSetFlags(xmlAutomataPtr am, int flags) { +xmlAutomataSetFlags(xmlAutomata *am, int flags) { if (am == NULL) return; am->flags |= flags; @@ -5541,8 +5541,8 @@ xmlAutomataSetFlags(xmlAutomataPtr am, int flags) { * @param am an automata * @returns the initial state of the automata */ -xmlAutomataStatePtr -xmlAutomataGetInitState(xmlAutomataPtr am) { +xmlAutomataState * +xmlAutomataGetInitState(xmlAutomata *am) { if (am == NULL) return(NULL); return(am->start); @@ -5556,7 +5556,7 @@ xmlAutomataGetInitState(xmlAutomataPtr am) { * @returns 0 or -1 in case of error */ int -xmlAutomataSetFinalState(xmlAutomataPtr am, xmlAutomataStatePtr state) { +xmlAutomataSetFinalState(xmlAutomata *am, xmlAutomataState *state) { if ((am == NULL) || (state == NULL)) return(-1); state->type = XML_REGEXP_FINAL_STATE; @@ -5575,9 +5575,9 @@ xmlAutomataSetFinalState(xmlAutomataPtr am, xmlAutomataStatePtr state) { * @param data data passed to the callback function if the transition is activated * @returns the target state or NULL in case of error */ -xmlAutomataStatePtr -xmlAutomataNewTransition(xmlAutomataPtr am, xmlAutomataStatePtr from, - xmlAutomataStatePtr to, const xmlChar *token, +xmlAutomataState * +xmlAutomataNewTransition(xmlAutomata *am, xmlAutomataState *from, + xmlAutomataState *to, const xmlChar *token, void *data) { xmlRegAtomPtr atom; @@ -5616,9 +5616,9 @@ xmlAutomataNewTransition(xmlAutomataPtr am, xmlAutomataStatePtr from, * @param data data passed to the callback function if the transition is activated * @returns the target state or NULL in case of error */ -xmlAutomataStatePtr -xmlAutomataNewTransition2(xmlAutomataPtr am, xmlAutomataStatePtr from, - xmlAutomataStatePtr to, const xmlChar *token, +xmlAutomataState * +xmlAutomataNewTransition2(xmlAutomata *am, xmlAutomataState *from, + xmlAutomataState *to, const xmlChar *token, const xmlChar *token2, void *data) { xmlRegAtomPtr atom; @@ -5674,9 +5674,9 @@ xmlAutomataNewTransition2(xmlAutomataPtr am, xmlAutomataStatePtr from, * @param data data passed to the callback function if the transition is activated * @returns the target state or NULL in case of error */ -xmlAutomataStatePtr -xmlAutomataNewNegTrans(xmlAutomataPtr am, xmlAutomataStatePtr from, - xmlAutomataStatePtr to, const xmlChar *token, +xmlAutomataState * +xmlAutomataNewNegTrans(xmlAutomata *am, xmlAutomataState *from, + xmlAutomataState *to, const xmlChar *token, const xmlChar *token2, void *data) { xmlRegAtomPtr atom; xmlChar err_msg[200]; @@ -5739,9 +5739,9 @@ xmlAutomataNewNegTrans(xmlAutomataPtr am, xmlAutomataStatePtr from, * @param data data associated to the transition * @returns the target state or NULL in case of error */ -xmlAutomataStatePtr -xmlAutomataNewCountTrans2(xmlAutomataPtr am, xmlAutomataStatePtr from, - xmlAutomataStatePtr to, const xmlChar *token, +xmlAutomataState * +xmlAutomataNewCountTrans2(xmlAutomata *am, xmlAutomataState *from, + xmlAutomataState *to, const xmlChar *token, const xmlChar *token2, int min, int max, void *data) { xmlRegAtomPtr atom; @@ -5832,9 +5832,9 @@ error: * @param data data associated to the transition * @returns the target state or NULL in case of error */ -xmlAutomataStatePtr -xmlAutomataNewCountTrans(xmlAutomataPtr am, xmlAutomataStatePtr from, - xmlAutomataStatePtr to, const xmlChar *token, +xmlAutomataState * +xmlAutomataNewCountTrans(xmlAutomata *am, xmlAutomataState *from, + xmlAutomataState *to, const xmlChar *token, int min, int max, void *data) { xmlRegAtomPtr atom; int counter; @@ -5908,9 +5908,9 @@ error: * @param data data associated to the transition * @returns the target state or NULL in case of error */ -xmlAutomataStatePtr -xmlAutomataNewOnceTrans2(xmlAutomataPtr am, xmlAutomataStatePtr from, - xmlAutomataStatePtr to, const xmlChar *token, +xmlAutomataState * +xmlAutomataNewOnceTrans2(xmlAutomata *am, xmlAutomataState *from, + xmlAutomataState *to, const xmlChar *token, const xmlChar *token2, int min, int max, void *data) { xmlRegAtomPtr atom; @@ -5994,9 +5994,9 @@ error: * @param data data associated to the transition * @returns the target state or NULL in case of error */ -xmlAutomataStatePtr -xmlAutomataNewOnceTrans(xmlAutomataPtr am, xmlAutomataStatePtr from, - xmlAutomataStatePtr to, const xmlChar *token, +xmlAutomataState * +xmlAutomataNewOnceTrans(xmlAutomata *am, xmlAutomataState *from, + xmlAutomataState *to, const xmlChar *token, int min, int max, void *data) { xmlRegAtomPtr atom; int counter; @@ -6047,8 +6047,8 @@ error: * @param am an automata * @returns the new state or NULL in case of error */ -xmlAutomataStatePtr -xmlAutomataNewState(xmlAutomataPtr am) { +xmlAutomataState * +xmlAutomataNewState(xmlAutomata *am) { if (am == NULL) return(NULL); return(xmlRegStatePush(am)); @@ -6064,9 +6064,9 @@ xmlAutomataNewState(xmlAutomataPtr am) { * @param to the target point of the transition or NULL * @returns the target state or NULL in case of error */ -xmlAutomataStatePtr -xmlAutomataNewEpsilon(xmlAutomataPtr am, xmlAutomataStatePtr from, - xmlAutomataStatePtr to) { +xmlAutomataState * +xmlAutomataNewEpsilon(xmlAutomata *am, xmlAutomataState *from, + xmlAutomataState *to) { if ((am == NULL) || (from == NULL)) return(NULL); xmlFAGenerateEpsilonTransition(am, from, to); @@ -6087,9 +6087,9 @@ xmlAutomataNewEpsilon(xmlAutomataPtr am, xmlAutomataStatePtr from, * @param lax allow to transition if not all all transitions have been activated * @returns the target state or NULL in case of error */ -xmlAutomataStatePtr -xmlAutomataNewAllTrans(xmlAutomataPtr am, xmlAutomataStatePtr from, - xmlAutomataStatePtr to, int lax) { +xmlAutomataState * +xmlAutomataNewAllTrans(xmlAutomata *am, xmlAutomataState *from, + xmlAutomataState *to, int lax) { if ((am == NULL) || (from == NULL)) return(NULL); xmlFAGenerateAllTransition(am, from, to, lax); @@ -6107,7 +6107,7 @@ xmlAutomataNewAllTrans(xmlAutomataPtr am, xmlAutomataStatePtr from, * @returns the counter number or -1 in case of error */ int -xmlAutomataNewCounter(xmlAutomataPtr am, int min, int max) { +xmlAutomataNewCounter(xmlAutomata *am, int min, int max) { int ret; if (am == NULL) @@ -6132,9 +6132,9 @@ xmlAutomataNewCounter(xmlAutomataPtr am, int min, int max) { * @param counter the counter associated to that transition * @returns the target state or NULL in case of error */ -xmlAutomataStatePtr -xmlAutomataNewCountedTrans(xmlAutomataPtr am, xmlAutomataStatePtr from, - xmlAutomataStatePtr to, int counter) { +xmlAutomataState * +xmlAutomataNewCountedTrans(xmlAutomata *am, xmlAutomataState *from, + xmlAutomataState *to, int counter) { if ((am == NULL) || (from == NULL) || (counter < 0)) return(NULL); xmlFAGenerateCountedEpsilonTransition(am, from, to, counter); @@ -6154,9 +6154,9 @@ xmlAutomataNewCountedTrans(xmlAutomataPtr am, xmlAutomataStatePtr from, * @param counter the counter associated to that transition * @returns the target state or NULL in case of error */ -xmlAutomataStatePtr -xmlAutomataNewCounterTrans(xmlAutomataPtr am, xmlAutomataStatePtr from, - xmlAutomataStatePtr to, int counter) { +xmlAutomataState * +xmlAutomataNewCounterTrans(xmlAutomata *am, xmlAutomataState *from, + xmlAutomataState *to, int counter) { if ((am == NULL) || (from == NULL) || (counter < 0)) return(NULL); xmlFAGenerateCountedTransition(am, from, to, counter); @@ -6172,8 +6172,8 @@ xmlAutomataNewCounterTrans(xmlAutomataPtr am, xmlAutomataStatePtr from, * @param am an automata * @returns the compiled regexp or NULL in case of error */ -xmlRegexpPtr -xmlAutomataCompile(xmlAutomataPtr am) { +xmlRegexp * +xmlAutomataCompile(xmlAutomata *am) { xmlRegexpPtr ret; if ((am == NULL) || (am->error != 0)) return(NULL); @@ -6193,7 +6193,7 @@ xmlAutomataCompile(xmlAutomataPtr am) { * @returns 1 if true, 0 if not, and -1 in case of error */ int -xmlAutomataIsDeterminist(xmlAutomataPtr am) { +xmlAutomataIsDeterminist(xmlAutomata *am) { int ret; if (am == NULL) @@ -6221,15 +6221,15 @@ typedef struct _xmlExpCtxt xmlExpCtxt; typedef xmlExpCtxt *xmlExpCtxtPtr; XMLPUBFUN void - xmlExpFreeCtxt (xmlExpCtxtPtr ctxt); -XMLPUBFUN xmlExpCtxtPtr + xmlExpFreeCtxt (xmlExpCtxt *ctxt); +XMLPUBFUN xmlExpCtxt * xmlExpNewCtxt (int maxNodes, - xmlDictPtr dict); + xmlDict *dict); XMLPUBFUN int - xmlExpCtxtNbNodes(xmlExpCtxtPtr ctxt); + xmlExpCtxtNbNodes(xmlExpCtxt *ctxt); XMLPUBFUN int - xmlExpCtxtNbCons(xmlExpCtxtPtr ctxt); + xmlExpCtxtNbCons(xmlExpCtxt *ctxt); /* Expressions are trees but the tree is opaque */ typedef struct _xmlExpNode xmlExpNode; @@ -6255,67 +6255,67 @@ XMLPUBVAR xmlExpNodePtr emptyExp; * Expressions are reference counted internally */ XMLPUBFUN void - xmlExpFree (xmlExpCtxtPtr ctxt, - xmlExpNodePtr expr); + xmlExpFree (xmlExpCtxt *ctxt, + xmlExpNode *expr); XMLPUBFUN void - xmlExpRef (xmlExpNodePtr expr); + xmlExpRef (xmlExpNode *expr); /* * constructors can be either manual or from a string */ -XMLPUBFUN xmlExpNodePtr - xmlExpParse (xmlExpCtxtPtr ctxt, +XMLPUBFUN xmlExpNode * + xmlExpParse (xmlExpCtxt *ctxt, const char *expr); -XMLPUBFUN xmlExpNodePtr - xmlExpNewAtom (xmlExpCtxtPtr ctxt, +XMLPUBFUN xmlExpNode * + xmlExpNewAtom (xmlExpCtxt *ctxt, const xmlChar *name, int len); -XMLPUBFUN xmlExpNodePtr - xmlExpNewOr (xmlExpCtxtPtr ctxt, - xmlExpNodePtr left, - xmlExpNodePtr right); -XMLPUBFUN xmlExpNodePtr - xmlExpNewSeq (xmlExpCtxtPtr ctxt, - xmlExpNodePtr left, - xmlExpNodePtr right); -XMLPUBFUN xmlExpNodePtr - xmlExpNewRange (xmlExpCtxtPtr ctxt, - xmlExpNodePtr subset, +XMLPUBFUN xmlExpNode * + xmlExpNewOr (xmlExpCtxt *ctxt, + xmlExpNode *left, + xmlExpNode *right); +XMLPUBFUN xmlExpNode * + xmlExpNewSeq (xmlExpCtxt *ctxt, + xmlExpNode *left, + xmlExpNode *right); +XMLPUBFUN xmlExpNode * + xmlExpNewRange (xmlExpCtxt *ctxt, + xmlExpNode *subset, int min, int max); /* * The really interesting APIs */ XMLPUBFUN int - xmlExpIsNillable(xmlExpNodePtr expr); + xmlExpIsNillable(xmlExpNode *expr); XMLPUBFUN int - xmlExpMaxToken (xmlExpNodePtr expr); + xmlExpMaxToken (xmlExpNode *expr); XMLPUBFUN int - xmlExpGetLanguage(xmlExpCtxtPtr ctxt, - xmlExpNodePtr expr, + xmlExpGetLanguage(xmlExpCtxt *ctxt, + xmlExpNode *expr, const xmlChar**langList, int len); XMLPUBFUN int - xmlExpGetStart (xmlExpCtxtPtr ctxt, - xmlExpNodePtr expr, + xmlExpGetStart (xmlExpCtxt *ctxt, + xmlExpNode *expr, const xmlChar**tokList, int len); -XMLPUBFUN xmlExpNodePtr - xmlExpStringDerive(xmlExpCtxtPtr ctxt, - xmlExpNodePtr expr, +XMLPUBFUN xmlExpNode * + xmlExpStringDerive(xmlExpCtxt *ctxt, + xmlExpNode *expr, const xmlChar *str, int len); -XMLPUBFUN xmlExpNodePtr - xmlExpExpDerive (xmlExpCtxtPtr ctxt, - xmlExpNodePtr expr, - xmlExpNodePtr sub); +XMLPUBFUN xmlExpNode * + xmlExpExpDerive (xmlExpCtxt *ctxt, + xmlExpNode *expr, + xmlExpNode *sub); XMLPUBFUN int - xmlExpSubsume (xmlExpCtxtPtr ctxt, - xmlExpNodePtr expr, - xmlExpNodePtr sub); + xmlExpSubsume (xmlExpCtxt *ctxt, + xmlExpNode *expr, + xmlExpNode *sub); XMLPUBFUN void - xmlExpDump (xmlBufferPtr buf, - xmlExpNodePtr expr); + xmlExpDump (xmlBuffer *buf, + xmlExpNode *expr); /************************************************************************ * * @@ -6343,8 +6343,8 @@ struct _xmlExpCtxt { * @param dict optional dictionary to use internally * @returns the context or NULL in case of error */ -xmlExpCtxtPtr -xmlExpNewCtxt(int maxNodes, xmlDictPtr dict) { +xmlExpCtxt * +xmlExpNewCtxt(int maxNodes, xmlDict *dict) { xmlExpCtxtPtr ret; int size = 256; @@ -6384,7 +6384,7 @@ xmlExpNewCtxt(int maxNodes, xmlDictPtr dict) { * @param ctxt an expression context */ void -xmlExpFreeCtxt(xmlExpCtxtPtr ctxt) { +xmlExpFreeCtxt(xmlExpCtxt *ctxt) { if (ctxt == NULL) return; xmlDictFree(ctxt->dict); @@ -6771,7 +6771,7 @@ xmlExpHashGetEntry(xmlExpCtxtPtr ctxt, xmlExpNodeType type, * @param exp the expression */ void -xmlExpFree(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp) { +xmlExpFree(xmlExpCtxt *ctxt, xmlExpNode *exp) { if ((exp == NULL) || (exp == forbiddenExp) || (exp == emptyExp)) return; exp->ref--; @@ -6812,7 +6812,7 @@ xmlExpFree(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp) { * @param exp the expression */ void -xmlExpRef(xmlExpNodePtr exp) { +xmlExpRef(xmlExpNode *exp) { if (exp != NULL) exp->ref++; } @@ -6825,8 +6825,8 @@ xmlExpRef(xmlExpNodePtr exp) { * @param len the atom name length in byte (or -1); * @returns the node or NULL in case of error */ -xmlExpNodePtr -xmlExpNewAtom(xmlExpCtxtPtr ctxt, const xmlChar *name, int len) { +xmlExpNode * +xmlExpNewAtom(xmlExpCtxt *ctxt, const xmlChar *name, int len) { if ((ctxt == NULL) || (name == NULL)) return(NULL); name = xmlDictLookup(ctxt->dict, name, len); @@ -6846,8 +6846,8 @@ xmlExpNewAtom(xmlExpCtxtPtr ctxt, const xmlChar *name, int len) { * @param right right expression * @returns the node or NULL in case of error */ -xmlExpNodePtr -xmlExpNewOr(xmlExpCtxtPtr ctxt, xmlExpNodePtr left, xmlExpNodePtr right) { +xmlExpNode * +xmlExpNewOr(xmlExpCtxt *ctxt, xmlExpNode *left, xmlExpNode *right) { if (ctxt == NULL) return(NULL); if ((left == NULL) || (right == NULL)) { @@ -6869,8 +6869,8 @@ xmlExpNewOr(xmlExpCtxtPtr ctxt, xmlExpNodePtr left, xmlExpNodePtr right) { * @param right right expression * @returns the node or NULL in case of error */ -xmlExpNodePtr -xmlExpNewSeq(xmlExpCtxtPtr ctxt, xmlExpNodePtr left, xmlExpNodePtr right) { +xmlExpNode * +xmlExpNewSeq(xmlExpCtxt *ctxt, xmlExpNode *left, xmlExpNode *right) { if (ctxt == NULL) return(NULL); if ((left == NULL) || (right == NULL)) { @@ -6893,8 +6893,8 @@ xmlExpNewSeq(xmlExpCtxtPtr ctxt, xmlExpNodePtr left, xmlExpNodePtr right) { * @param max the upper bound for the repetition, -1 means infinite * @returns the node or NULL in case of error */ -xmlExpNodePtr -xmlExpNewRange(xmlExpCtxtPtr ctxt, xmlExpNodePtr subset, int min, int max) { +xmlExpNode * +xmlExpNewRange(xmlExpCtxt *ctxt, xmlExpNode *subset, int min, int max) { if (ctxt == NULL) return(NULL); if ((subset == NULL) || (min < 0) || (max < -1) || @@ -6956,7 +6956,7 @@ tail: * -2 if there is more than `len` strings */ int -xmlExpGetLanguage(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, +xmlExpGetLanguage(xmlExpCtxt *ctxt, xmlExpNode *exp, const xmlChar**langList, int len) { if ((ctxt == NULL) || (exp == NULL) || (langList == NULL) || (len <= 0)) return(-1); @@ -7022,7 +7022,7 @@ tail: * -2 if there is more than `len` strings */ int -xmlExpGetStart(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, +xmlExpGetStart(xmlExpCtxt *ctxt, xmlExpNode *exp, const xmlChar**tokList, int len) { if ((ctxt == NULL) || (exp == NULL) || (tokList == NULL) || (len <= 0)) return(-1); @@ -7036,7 +7036,7 @@ xmlExpGetStart(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, * @returns 1 if nillable, 0 if not and -1 in case of error */ int -xmlExpIsNillable(xmlExpNodePtr exp) { +xmlExpIsNillable(xmlExpNode *exp) { if (exp == NULL) return(-1); return(IS_NILLABLE(exp) != 0); @@ -7135,8 +7135,8 @@ xmlExpStringDeriveInt(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, const xmlChar *str) * @param len the string len in bytes if available * @returns the resulting expression or NULL in case of internal error */ -xmlExpNodePtr -xmlExpStringDerive(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, +xmlExpNode * +xmlExpStringDerive(xmlExpCtxt *ctxt, xmlExpNode *exp, const xmlChar *str, int len) { const xmlChar *input; @@ -7594,8 +7594,8 @@ xmlExpExpDeriveInt(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, xmlExpNodePtr sub) { * @returns the resulting expression or NULL in case of internal error, the * result must be freed */ -xmlExpNodePtr -xmlExpExpDerive(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, xmlExpNodePtr sub) { +xmlExpNode * +xmlExpExpDerive(xmlExpCtxt *ctxt, xmlExpNode *exp, xmlExpNode *sub) { if ((exp == NULL) || (ctxt == NULL) || (sub == NULL)) return(NULL); @@ -7621,7 +7621,7 @@ xmlExpExpDerive(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, xmlExpNodePtr sub) { * @returns 1 if true 0 if false and -1 in case of failure. */ int -xmlExpSubsume(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, xmlExpNodePtr sub) { +xmlExpSubsume(xmlExpCtxt *ctxt, xmlExpNode *exp, xmlExpNode *sub) { xmlExpNodePtr tmp; if ((exp == NULL) || (ctxt == NULL) || (sub == NULL)) @@ -7820,8 +7820,8 @@ xmlExpParseExpr(xmlExpCtxtPtr ctxt) { * @param expr the 0 terminated string * @returns a new expression or NULL in case of failure */ -xmlExpNodePtr -xmlExpParse(xmlExpCtxtPtr ctxt, const char *expr) { +xmlExpNode * +xmlExpParse(xmlExpCtxt *ctxt, const char *expr) { xmlExpNodePtr ret; ctxt->expr = expr; @@ -7919,7 +7919,7 @@ xmlExpDumpInt(xmlBufferPtr buf, xmlExpNodePtr expr, int glob) { * @param expr the compiled expression */ void -xmlExpDump(xmlBufferPtr buf, xmlExpNodePtr expr) { +xmlExpDump(xmlBuffer *buf, xmlExpNode *expr) { if ((buf == NULL) || (expr == NULL)) return; xmlExpDumpInt(buf, expr, 0); @@ -7932,7 +7932,7 @@ xmlExpDump(xmlBufferPtr buf, xmlExpNodePtr expr) { * @returns the maximum length or -1 in case of error */ int -xmlExpMaxToken(xmlExpNodePtr expr) { +xmlExpMaxToken(xmlExpNode *expr) { if (expr == NULL) return(-1); return(expr->c_max); @@ -7945,7 +7945,7 @@ xmlExpMaxToken(xmlExpNodePtr expr) { * @returns the number of nodes in use or -1 in case of error */ int -xmlExpCtxtNbNodes(xmlExpCtxtPtr ctxt) { +xmlExpCtxtNbNodes(xmlExpCtxt *ctxt) { if (ctxt == NULL) return(-1); return(ctxt->nb_nodes); @@ -7958,7 +7958,7 @@ xmlExpCtxtNbNodes(xmlExpCtxtPtr ctxt) { * @returns the number of nodes ever allocated or -1 in case of error */ int -xmlExpCtxtNbCons(xmlExpCtxtPtr ctxt) { +xmlExpCtxtNbCons(xmlExpCtxt *ctxt) { if (ctxt == NULL) return(-1); return(ctxt->nb_cons); diff --git a/xmlsave.c b/xmlsave.c index fc7dacfb..d88d1b72 100644 --- a/xmlsave.c +++ b/xmlsave.c @@ -123,7 +123,7 @@ xmlSaveErr(xmlOutputBufferPtr out, int code, xmlNodePtr node, * @returns 0 on success, -1 if the string is NULL, empty or too long. */ int -xmlSaveSetIndentString(xmlSaveCtxtPtr ctxt, const char *indent) { +xmlSaveSetIndentString(xmlSaveCtxt *ctxt, const char *indent) { size_t len; int i; @@ -810,7 +810,7 @@ xmlNsListDumpOutputCtxt(xmlSaveCtxtPtr ctxt, xmlNsPtr cur) { * @param cur the first namespace */ void -xmlNsListDumpOutput(xmlOutputBufferPtr buf, xmlNsPtr cur) { +xmlNsListDumpOutput(xmlOutputBuffer *buf, xmlNs *cur) { while (cur != NULL) { xmlNsDumpOutput(buf, cur, NULL); cur = cur->next; @@ -1827,7 +1827,7 @@ xhtmlNodeDumpOutput(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) { * @param options a set of xmlSaveOptions * @returns a new serialization context or NULL in case of error. */ -xmlSaveCtxtPtr +xmlSaveCtxt * xmlSaveToFd(int fd, const char *encoding, int options) { xmlSaveCtxtPtr ret; @@ -1858,7 +1858,7 @@ xmlSaveToFd(int fd, const char *encoding, int options) * @param options a set of xmlSaveOptions * @returns a new serialization context or NULL in case of error. */ -xmlSaveCtxtPtr +xmlSaveCtxt * xmlSaveToFilename(const char *filename, const char *encoding, int options) { xmlSaveCtxtPtr ret; @@ -1892,8 +1892,8 @@ xmlSaveToFilename(const char *filename, const char *encoding, int options) * @returns a new serialization context or NULL in case of error. */ -xmlSaveCtxtPtr -xmlSaveToBuffer(xmlBufferPtr buffer, const char *encoding, int options) +xmlSaveCtxt * +xmlSaveToBuffer(xmlBuffer *buffer, const char *encoding, int options) { xmlSaveCtxtPtr ret; @@ -1925,7 +1925,7 @@ xmlSaveToBuffer(xmlBufferPtr buffer, const char *encoding, int options) * @param options a set of xmlSaveOptions * @returns a new serialization context or NULL in case of error. */ -xmlSaveCtxtPtr +xmlSaveCtxt * xmlSaveToIO(xmlOutputWriteCallback iowrite, xmlOutputCloseCallback ioclose, void *ioctx, const char *encoding, int options) @@ -1955,7 +1955,7 @@ xmlSaveToIO(xmlOutputWriteCallback iowrite, * @returns 0 on success or -1 in case of error. */ long -xmlSaveDoc(xmlSaveCtxtPtr ctxt, xmlDocPtr doc) +xmlSaveDoc(xmlSaveCtxt *ctxt, xmlDoc *doc) { long ret = 0; @@ -1975,7 +1975,7 @@ xmlSaveDoc(xmlSaveCtxtPtr ctxt, xmlDocPtr doc) * @returns 0 on success or -1 in case of error. */ long -xmlSaveTree(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) +xmlSaveTree(xmlSaveCtxt *ctxt, xmlNode *cur) { long ret = 0; @@ -2005,7 +2005,7 @@ xmlSaveTree(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) * @returns 0 on succes, -1 on error. */ int -xmlSaveNotationDecl(xmlSaveCtxtPtr ctxt, xmlNotationPtr cur) { +xmlSaveNotationDecl(xmlSaveCtxt *ctxt, xmlNotation *cur) { if (ctxt == NULL) return(-1); xmlBufDumpNotationDecl(ctxt->buf, cur); @@ -2020,7 +2020,7 @@ xmlSaveNotationDecl(xmlSaveCtxtPtr ctxt, xmlNotationPtr cur) { * @returns 0 on succes, -1 on error. */ int -xmlSaveNotationTable(xmlSaveCtxtPtr ctxt, xmlNotationTablePtr cur) { +xmlSaveNotationTable(xmlSaveCtxt *ctxt, xmlNotationTable *cur) { if (ctxt == NULL) return(-1); xmlBufDumpNotationTable(ctxt->buf, cur); @@ -2035,7 +2035,7 @@ xmlSaveNotationTable(xmlSaveCtxtPtr ctxt, xmlNotationTablePtr cur) { * @returns the number of bytes written or -1 in case of error. */ int -xmlSaveFlush(xmlSaveCtxtPtr ctxt) +xmlSaveFlush(xmlSaveCtxt *ctxt) { if (ctxt == NULL) return(-1); if (ctxt->buf == NULL) return(-1); @@ -2050,7 +2050,7 @@ xmlSaveFlush(xmlSaveCtxtPtr ctxt) * @returns the number of bytes written or -1 in case of error. */ int -xmlSaveClose(xmlSaveCtxtPtr ctxt) +xmlSaveClose(xmlSaveCtxt *ctxt) { int ret; @@ -2070,7 +2070,7 @@ xmlSaveClose(xmlSaveCtxtPtr ctxt) * @returns an xmlParserErrors code. */ xmlParserErrors -xmlSaveFinish(xmlSaveCtxtPtr ctxt) +xmlSaveFinish(xmlSaveCtxt *ctxt) { int ret; @@ -2099,7 +2099,7 @@ xmlSaveFinish(xmlSaveCtxtPtr ctxt) * @returns 0 if successful or -1 in case of error. */ int -xmlSaveSetEscape(xmlSaveCtxtPtr ctxt, xmlCharEncodingOutputFunc escape) +xmlSaveSetEscape(xmlSaveCtxt *ctxt, xmlCharEncodingOutputFunc escape) { if (ctxt == NULL) return(-1); ctxt->escape = escape; @@ -2116,7 +2116,7 @@ xmlSaveSetEscape(xmlSaveCtxtPtr ctxt, xmlCharEncodingOutputFunc escape) * @returns 0 if successful or -1 in case of error. */ int -xmlSaveSetAttrEscape(xmlSaveCtxtPtr ctxt, +xmlSaveSetAttrEscape(xmlSaveCtxt *ctxt, xmlCharEncodingOutputFunc escape ATTRIBUTE_UNUSED) { if (ctxt == NULL) return(-1); @@ -2137,7 +2137,7 @@ xmlSaveSetAttrEscape(xmlSaveCtxtPtr ctxt, * @param string the text content */ void -xmlBufAttrSerializeTxtContent(xmlOutputBufferPtr buf, xmlDocPtr doc, +xmlBufAttrSerializeTxtContent(xmlOutputBuffer *buf, xmlDoc *doc, const xmlChar *string) { int flags = XML_ESCAPE_ATTR; @@ -2156,8 +2156,8 @@ xmlBufAttrSerializeTxtContent(xmlOutputBufferPtr buf, xmlDocPtr doc, * @param string the text content */ void -xmlAttrSerializeTxtContent(xmlBufferPtr buf, xmlDocPtr doc, - xmlAttrPtr attr ATTRIBUTE_UNUSED, +xmlAttrSerializeTxtContent(xmlBuffer *buf, xmlDoc *doc, + xmlAttr *attr ATTRIBUTE_UNUSED, const xmlChar *string) { xmlOutputBufferPtr out; @@ -2192,7 +2192,7 @@ xmlAttrSerializeTxtContent(xmlBufferPtr buf, xmlDocPtr doc, * @returns the number of bytes written to the buffer or -1 in case of error */ int -xmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level, +xmlNodeDump(xmlBuffer *buf, xmlDoc *doc, xmlNode *cur, int level, int format) { xmlBufPtr buffer; @@ -2234,7 +2234,7 @@ xmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level, */ size_t -xmlBufNodeDump(xmlBufPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level, +xmlBufNodeDump(xmlBuf *buf, xmlDoc *doc, xmlNode *cur, int level, int format) { size_t use; @@ -2283,7 +2283,7 @@ xmlBufNodeDump(xmlBufPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level, * @param cur the current node */ void -xmlElemDump(FILE * f, xmlDocPtr doc, xmlNodePtr cur) +xmlElemDump(FILE * f, xmlDoc *doc, xmlNode *cur) { xmlOutputBufferPtr outbuf; @@ -2329,7 +2329,7 @@ xmlElemDump(FILE * f, xmlDocPtr doc, xmlNodePtr cur) * @param encoding an optional encoding string */ void -xmlNodeDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, +xmlNodeDumpOutput(xmlOutputBuffer *buf, xmlDoc *doc, xmlNode *cur, int level, int format, const char *encoding) { xmlSaveCtxt ctxt; @@ -2424,7 +2424,7 @@ xmlDocDumpInternal(xmlOutputBufferPtr buf, xmlDocPtr doc, const char *encoding, */ void -xmlDocDumpFormatMemoryEnc(xmlDocPtr out_doc, xmlChar **doc_txt_ptr, +xmlDocDumpFormatMemoryEnc(xmlDoc *out_doc, xmlChar **doc_txt_ptr, int * doc_txt_len, const char * txt_encoding, int format) { xmlOutputBufferPtr buf = NULL; @@ -2467,7 +2467,7 @@ xmlDocDumpFormatMemoryEnc(xmlDocPtr out_doc, xmlChar **doc_txt_ptr, * @param size OUT: the memory length */ void -xmlDocDumpMemory(xmlDocPtr cur, xmlChar**mem, int *size) { +xmlDocDumpMemory(xmlDoc *cur, xmlChar**mem, int *size) { xmlDocDumpFormatMemoryEnc(cur, mem, size, NULL, 0); } @@ -2481,7 +2481,7 @@ xmlDocDumpMemory(xmlDocPtr cur, xmlChar**mem, int *size) { * @param format should formatting spaces been added */ void -xmlDocDumpFormatMemory(xmlDocPtr cur, xmlChar**mem, int *size, int format) { +xmlDocDumpFormatMemory(xmlDoc *cur, xmlChar**mem, int *size, int format) { xmlDocDumpFormatMemoryEnc(cur, mem, size, NULL, format); } @@ -2495,7 +2495,7 @@ xmlDocDumpFormatMemory(xmlDocPtr cur, xmlChar**mem, int *size, int format) { */ void -xmlDocDumpMemoryEnc(xmlDocPtr out_doc, xmlChar **doc_txt_ptr, +xmlDocDumpMemoryEnc(xmlDoc *out_doc, xmlChar **doc_txt_ptr, int * doc_txt_len, const char * txt_encoding) { xmlDocDumpFormatMemoryEnc(out_doc, doc_txt_ptr, doc_txt_len, txt_encoding, 0); @@ -2516,7 +2516,7 @@ xmlDocDumpMemoryEnc(xmlDocPtr out_doc, xmlChar **doc_txt_ptr, * @returns the number of bytes written or -1 in case of failure. */ int -xmlDocFormatDump(FILE *f, xmlDocPtr cur, int format) { +xmlDocFormatDump(FILE *f, xmlDoc *cur, int format) { xmlOutputBufferPtr buf; if (cur == NULL) { @@ -2542,7 +2542,7 @@ xmlDocFormatDump(FILE *f, xmlDocPtr cur, int format) { * @returns the number of bytes written or -1 in case of failure. */ int -xmlDocDump(FILE *f, xmlDocPtr cur) { +xmlDocDump(FILE *f, xmlDoc *cur) { return(xmlDocFormatDump (f, cur, 0)); } @@ -2557,7 +2557,7 @@ xmlDocDump(FILE *f, xmlDocPtr cur) { * @returns the number of bytes written or -1 in case of failure. */ int -xmlSaveFileTo(xmlOutputBufferPtr buf, xmlDocPtr cur, const char *encoding) { +xmlSaveFileTo(xmlOutputBuffer *buf, xmlDoc *cur, const char *encoding) { return(xmlSaveFormatFileTo(buf, cur, encoding, 0)); } @@ -2581,7 +2581,7 @@ xmlSaveFileTo(xmlOutputBufferPtr buf, xmlDocPtr cur, const char *encoding) { * @returns the number of bytes written or -1 in case of failure. */ int -xmlSaveFormatFileTo(xmlOutputBufferPtr buf, xmlDocPtr cur, +xmlSaveFormatFileTo(xmlOutputBuffer *buf, xmlDoc *cur, const char *encoding, int format) { if (buf == NULL) return(-1); @@ -2616,7 +2616,7 @@ xmlSaveFormatFileTo(xmlOutputBufferPtr buf, xmlDocPtr cur, * @returns the number of bytes written or -1 in case of error. */ int -xmlSaveFormatFileEnc( const char * filename, xmlDocPtr cur, +xmlSaveFormatFileEnc( const char * filename, xmlDoc *cur, const char * encoding, int format ) { xmlOutputBufferPtr buf; @@ -2647,7 +2647,7 @@ xmlSaveFormatFileEnc( const char * filename, xmlDocPtr cur, * @returns the number of bytes written or -1 in case of failure. */ int -xmlSaveFileEnc(const char *filename, xmlDocPtr cur, const char *encoding) { +xmlSaveFileEnc(const char *filename, xmlDoc *cur, const char *encoding) { return ( xmlSaveFormatFileEnc( filename, cur, encoding, 0 ) ); } @@ -2660,7 +2660,7 @@ xmlSaveFileEnc(const char *filename, xmlDocPtr cur, const char *encoding) { * @returns the number of bytes written or -1 in case of failure. */ int -xmlSaveFormatFile(const char *filename, xmlDocPtr cur, int format) { +xmlSaveFormatFile(const char *filename, xmlDoc *cur, int format) { return ( xmlSaveFormatFileEnc( filename, cur, NULL, format ) ); } @@ -2673,7 +2673,7 @@ xmlSaveFormatFile(const char *filename, xmlDocPtr cur, int format) { * @returns the number of bytes written or -1 in case of failure. */ int -xmlSaveFile(const char *filename, xmlDocPtr cur) { +xmlSaveFile(const char *filename, xmlDoc *cur) { return(xmlSaveFormatFileEnc(filename, cur, NULL, 0)); } diff --git a/xmlschemas.c b/xmlschemas.c index 512a95f6..7ef50498 100644 --- a/xmlschemas.c +++ b/xmlschemas.c @@ -3288,7 +3288,7 @@ xmlSchemaNewSchema(xmlSchemaParserCtxtPtr ctxt) * * @returns the newly allocated structure or NULL in case or error */ -xmlSchemaFacetPtr +xmlSchemaFacet * xmlSchemaNewFacet(void) { xmlSchemaFacetPtr ret; @@ -3748,7 +3748,7 @@ xmlSchemaFreeWildcardNsSet(xmlSchemaWildcardNsPtr set) * @param wildcard a wildcard structure */ void -xmlSchemaFreeWildcard(xmlSchemaWildcardPtr wildcard) +xmlSchemaFreeWildcard(xmlSchemaWildcard *wildcard) { if (wildcard == NULL) return; @@ -3880,7 +3880,7 @@ xmlSchemaFreeElement(xmlSchemaElementPtr elem) * @param facet a schema facet structure */ void -xmlSchemaFreeFacet(xmlSchemaFacetPtr facet) +xmlSchemaFreeFacet(xmlSchemaFacet *facet) { if (facet == NULL) return; @@ -3899,7 +3899,7 @@ xmlSchemaFreeFacet(xmlSchemaFacetPtr facet) * @param type a schema type structure */ void -xmlSchemaFreeType(xmlSchemaTypePtr type) +xmlSchemaFreeType(xmlSchemaType *type) { if (type == NULL) return; @@ -4040,7 +4040,7 @@ xmlSchemaComponentListFree(xmlSchemaItemListPtr list) * @param schema a schema structure */ void -xmlSchemaFree(xmlSchemaPtr schema) +xmlSchemaFree(xmlSchema *schema) { if (schema == NULL) return; @@ -4434,7 +4434,7 @@ xmlSchemaTypeDumpEntry(void *type, void *output, * @param schema a schema structure */ void -xmlSchemaDump(FILE * output, xmlSchemaPtr schema) +xmlSchemaDump(FILE * output, xmlSchema *schema) { if (output == NULL) return; @@ -12163,7 +12163,7 @@ xmlSchemaParserCtxtGetOptions(xmlSchemaParserCtxtPtr ctxt) * @param URL the location of the schema * @returns the parser context or NULL in case of error */ -xmlSchemaParserCtxtPtr +xmlSchemaParserCtxt * xmlSchemaNewParserCtxt(const char *URL) { xmlSchemaParserCtxtPtr ret; @@ -12187,7 +12187,7 @@ xmlSchemaNewParserCtxt(const char *URL) * @param size the size of the array * @returns the parser context or NULL in case of error */ -xmlSchemaParserCtxtPtr +xmlSchemaParserCtxt * xmlSchemaNewMemParserCtxt(const char *buffer, int size) { xmlSchemaParserCtxtPtr ret; @@ -12210,8 +12210,8 @@ xmlSchemaNewMemParserCtxt(const char *buffer, int size) * @param doc a preparsed document tree * @returns the parser context or NULL in case of error */ -xmlSchemaParserCtxtPtr -xmlSchemaNewDocParserCtxt(xmlDocPtr doc) +xmlSchemaParserCtxt * +xmlSchemaNewDocParserCtxt(xmlDoc *doc) { xmlSchemaParserCtxtPtr ret; @@ -12234,7 +12234,7 @@ xmlSchemaNewDocParserCtxt(xmlDocPtr doc) * @param ctxt the schema parser context */ void -xmlSchemaFreeParserCtxt(xmlSchemaParserCtxtPtr ctxt) +xmlSchemaFreeParserCtxt(xmlSchemaParserCtxt *ctxt) { if (ctxt == NULL) return; @@ -18225,9 +18225,9 @@ xmlSchemaTypeFixup(xmlSchemaTypePtr type, * -1 in case of an internal or API error. */ int -xmlSchemaCheckFacet(xmlSchemaFacetPtr facet, - xmlSchemaTypePtr typeDecl, - xmlSchemaParserCtxtPtr pctxt, +xmlSchemaCheckFacet(xmlSchemaFacet *facet, + xmlSchemaType *typeDecl, + xmlSchemaParserCtxt *pctxt, const xmlChar * name ATTRIBUTE_UNUSED) { int ret = 0, ctxtGiven; @@ -20856,8 +20856,8 @@ exit: * @returns the internal XML Schema structure built from the resource or * NULL in case of error */ -xmlSchemaPtr -xmlSchemaParse(xmlSchemaParserCtxtPtr ctxt) +xmlSchema * +xmlSchemaParse(xmlSchemaParserCtxt *ctxt) { xmlSchemaPtr mainSchema = NULL; xmlSchemaBucketPtr bucket = NULL; @@ -20982,7 +20982,7 @@ exit_failure: * @param ctx contextual data for the callbacks */ void -xmlSchemaSetParserErrors(xmlSchemaParserCtxtPtr ctxt, +xmlSchemaSetParserErrors(xmlSchemaParserCtxt *ctxt, xmlSchemaValidityErrorFunc err, xmlSchemaValidityWarningFunc warn, void *ctx) { @@ -21003,7 +21003,7 @@ xmlSchemaSetParserErrors(xmlSchemaParserCtxtPtr ctxt, * @param ctx the functions context */ void -xmlSchemaSetParserStructuredErrors(xmlSchemaParserCtxtPtr ctxt, +xmlSchemaSetParserStructuredErrors(xmlSchemaParserCtxt *ctxt, xmlStructuredErrorFunc serror, void *ctx) { @@ -21025,7 +21025,7 @@ xmlSchemaSetParserStructuredErrors(xmlSchemaParserCtxtPtr ctxt, * @returns -1 in case of failure, 0 otherwise */ int -xmlSchemaGetParserErrors(xmlSchemaParserCtxtPtr ctxt, +xmlSchemaGetParserErrors(xmlSchemaParserCtxt *ctxt, xmlSchemaValidityErrorFunc * err, xmlSchemaValidityWarningFunc * warn, void **ctx) { @@ -21050,7 +21050,7 @@ xmlSchemaGetParserErrors(xmlSchemaParserCtxtPtr ctxt, * @param data user data which will be passed to the loader */ void -xmlSchemaSetResourceLoader(xmlSchemaParserCtxtPtr ctxt, +xmlSchemaSetResourceLoader(xmlSchemaParserCtxt *ctxt, xmlResourceLoader loader, void *data) { if (ctxt == NULL) return; @@ -27024,8 +27024,8 @@ internal_error: * @param schema a precompiled XML Schemas * @returns the validation context or NULL in case of error */ -xmlSchemaValidCtxtPtr -xmlSchemaNewValidCtxt(xmlSchemaPtr schema) +xmlSchemaValidCtxt * +xmlSchemaNewValidCtxt(xmlSchema *schema) { xmlSchemaValidCtxtPtr ret; @@ -27058,7 +27058,7 @@ xmlSchemaNewValidCtxt(xmlSchemaPtr schema) * @param filename the file name */ void -xmlSchemaValidateSetFilename(xmlSchemaValidCtxtPtr vctxt, const char *filename) { +xmlSchemaValidateSetFilename(xmlSchemaValidCtxt *vctxt, const char *filename) { if (vctxt == NULL) return; if (vctxt->filename != NULL) @@ -27199,7 +27199,7 @@ xmlSchemaClearValidCtxt(xmlSchemaValidCtxtPtr vctxt) * @param ctxt the schema validation context */ void -xmlSchemaFreeValidCtxt(xmlSchemaValidCtxtPtr ctxt) +xmlSchemaFreeValidCtxt(xmlSchemaValidCtxt *ctxt) { if (ctxt == NULL) return; @@ -27288,7 +27288,7 @@ xmlSchemaFreeValidCtxt(xmlSchemaValidCtxtPtr ctxt) * of internal error. */ int -xmlSchemaIsValid(xmlSchemaValidCtxtPtr ctxt) +xmlSchemaIsValid(xmlSchemaValidCtxt *ctxt) { if (ctxt == NULL) return(-1); @@ -27306,7 +27306,7 @@ xmlSchemaIsValid(xmlSchemaValidCtxtPtr ctxt) * @param ctx the functions context */ void -xmlSchemaSetValidErrors(xmlSchemaValidCtxtPtr ctxt, +xmlSchemaSetValidErrors(xmlSchemaValidCtxt *ctxt, xmlSchemaValidityErrorFunc err, xmlSchemaValidityWarningFunc warn, void *ctx) { @@ -27327,7 +27327,7 @@ xmlSchemaSetValidErrors(xmlSchemaValidCtxtPtr ctxt, * @param ctx the functions context */ void -xmlSchemaSetValidStructuredErrors(xmlSchemaValidCtxtPtr ctxt, +xmlSchemaSetValidStructuredErrors(xmlSchemaValidCtxt *ctxt, xmlStructuredErrorFunc serror, void *ctx) { if (ctxt == NULL) @@ -27350,7 +27350,7 @@ xmlSchemaSetValidStructuredErrors(xmlSchemaValidCtxtPtr ctxt, * @returns -1 in case of error and 0 otherwise */ int -xmlSchemaGetValidErrors(xmlSchemaValidCtxtPtr ctxt, +xmlSchemaGetValidErrors(xmlSchemaValidCtxt *ctxt, xmlSchemaValidityErrorFunc * err, xmlSchemaValidityWarningFunc * warn, void **ctx) { @@ -27375,7 +27375,7 @@ xmlSchemaGetValidErrors(xmlSchemaValidCtxtPtr ctxt, * API error. */ int -xmlSchemaSetValidOptions(xmlSchemaValidCtxtPtr ctxt, +xmlSchemaSetValidOptions(xmlSchemaValidCtxt *ctxt, int options) { @@ -27404,7 +27404,7 @@ xmlSchemaSetValidOptions(xmlSchemaValidCtxtPtr ctxt, * @returns the option combination or -1 on error. */ int -xmlSchemaValidCtxtGetOptions(xmlSchemaValidCtxtPtr ctxt) +xmlSchemaValidCtxtGetOptions(xmlSchemaValidCtxt *ctxt) { if (ctxt == NULL) @@ -27705,7 +27705,7 @@ xmlSchemaVStart(xmlSchemaValidCtxtPtr vctxt) * code number otherwise and -1 in case of an internal or API error. */ int -xmlSchemaValidateOneElement(xmlSchemaValidCtxtPtr ctxt, xmlNodePtr elem) +xmlSchemaValidateOneElement(xmlSchemaValidCtxt *ctxt, xmlNode *elem) { if ((ctxt == NULL) || (elem == NULL) || (elem->type != XML_ELEMENT_NODE)) return (-1); @@ -27728,7 +27728,7 @@ xmlSchemaValidateOneElement(xmlSchemaValidCtxtPtr ctxt, xmlNodePtr elem) * number otherwise and -1 in case of internal or API error. */ int -xmlSchemaValidateDoc(xmlSchemaValidCtxtPtr ctxt, xmlDocPtr doc) +xmlSchemaValidateDoc(xmlSchemaValidCtxt *ctxt, xmlDoc *doc) { if ((ctxt == NULL) || (doc == NULL)) return (-1); @@ -28098,9 +28098,9 @@ endElementNsSplit(void *ctx, const xmlChar * localname, * @returns a pointer to a data structure needed to unplug the validation layer * or NULL in case of errors. */ -xmlSchemaSAXPlugPtr -xmlSchemaSAXPlug(xmlSchemaValidCtxtPtr ctxt, - xmlSAXHandlerPtr *sax, void **user_data) +xmlSchemaSAXPlugStruct * +xmlSchemaSAXPlug(xmlSchemaValidCtxt *ctxt, + xmlSAXHandler **sax, void **user_data) { xmlSchemaSAXPlugPtr ret; xmlSAXHandlerPtr old_sax; @@ -28239,7 +28239,7 @@ xmlSchemaSAXPlug(xmlSchemaValidCtxtPtr ctxt, * @returns 0 in case of success and -1 in case of failure. */ int -xmlSchemaSAXUnplug(xmlSchemaSAXPlugPtr plug) +xmlSchemaSAXUnplug(xmlSchemaSAXPlugStruct *plug) { xmlSAXHandlerPtr *sax; void **user_data; @@ -28274,7 +28274,7 @@ xmlSchemaSAXUnplug(xmlSchemaSAXPlugPtr plug) */ void -xmlSchemaValidateSetLocator(xmlSchemaValidCtxtPtr vctxt, +xmlSchemaValidateSetLocator(xmlSchemaValidCtxt *vctxt, xmlSchemaValidityLocatorFunc f, void *ctxt) { @@ -28377,8 +28377,8 @@ done: * number otherwise and -1 in case of internal or API error. */ int -xmlSchemaValidateStream(xmlSchemaValidCtxtPtr ctxt, - xmlParserInputBufferPtr input, xmlCharEncoding enc, +xmlSchemaValidateStream(xmlSchemaValidCtxt *ctxt, + xmlParserInputBuffer *input, xmlCharEncoding enc, const xmlSAXHandler *sax, void *user_data) { xmlParserCtxtPtr pctxt = NULL; @@ -28442,7 +28442,7 @@ done: * number otherwise and -1 in case of an internal or API error. */ int -xmlSchemaValidateFile(xmlSchemaValidCtxtPtr ctxt, +xmlSchemaValidateFile(xmlSchemaValidCtxt *ctxt, const char * filename, int options ATTRIBUTE_UNUSED) { @@ -28470,8 +28470,8 @@ xmlSchemaValidateFile(xmlSchemaValidCtxtPtr ctxt, * @returns the parser context of the schema validation context or NULL * in case of error. */ -xmlParserCtxtPtr -xmlSchemaValidCtxtGetParserCtxt(xmlSchemaValidCtxtPtr ctxt) +xmlParserCtxt * +xmlSchemaValidCtxtGetParserCtxt(xmlSchemaValidCtxt *ctxt) { if (ctxt == NULL) return(NULL); diff --git a/xmlschemastypes.c b/xmlschemastypes.c index feaf9704..c6d9b424 100644 --- a/xmlschemastypes.c +++ b/xmlschemastypes.c @@ -885,7 +885,7 @@ xmlSchemaCleanupTypes(void) { * 0 otherwise and -1 in case the type is not a built-in type. */ int -xmlSchemaIsBuiltInTypeFacet(xmlSchemaTypePtr type, int facetType) +xmlSchemaIsBuiltInTypeFacet(xmlSchemaType *type, int facetType) { if (type == NULL) return (-1); @@ -960,7 +960,7 @@ xmlSchemaIsBuiltInTypeFacet(xmlSchemaTypePtr type, int facetType) * @param type the type of the built in type * @returns the type if found, NULL otherwise. */ -xmlSchemaTypePtr +xmlSchemaType * xmlSchemaGetBuiltInType(xmlSchemaValType type) { if ((xmlSchemaTypesInitialized == 0) && @@ -1073,7 +1073,7 @@ xmlSchemaGetBuiltInType(xmlSchemaValType type) * @returns 0 if succeeded and -1 on API errors. */ int -xmlSchemaValueAppend(xmlSchemaValPtr prev, xmlSchemaValPtr cur) { +xmlSchemaValueAppend(xmlSchemaVal *prev, xmlSchemaVal *cur) { if ((prev == NULL) || (cur == NULL)) return (-1); @@ -1088,8 +1088,8 @@ xmlSchemaValueAppend(xmlSchemaValPtr prev, xmlSchemaValPtr cur) { * @returns the next value or NULL if there was none, or on * API errors. */ -xmlSchemaValPtr -xmlSchemaValueGetNext(xmlSchemaValPtr cur) { +xmlSchemaVal * +xmlSchemaValueGetNext(xmlSchemaVal *cur) { if (cur == NULL) return (NULL); @@ -1104,7 +1104,7 @@ xmlSchemaValueGetNext(xmlSchemaValPtr cur) { * API errors. */ const xmlChar * -xmlSchemaValueGetAsString(xmlSchemaValPtr val) +xmlSchemaValueGetAsString(xmlSchemaVal *val) { if (val == NULL) return (NULL); @@ -1135,7 +1135,7 @@ xmlSchemaValueGetAsString(xmlSchemaValPtr val) * @returns 1 if true and 0 if false, or in case of an error. Hmm. */ int -xmlSchemaValueGetAsBoolean(xmlSchemaValPtr val) +xmlSchemaValueGetAsBoolean(xmlSchemaVal *val) { if ((val == NULL) || (val->type != XML_SCHEMAS_BOOLEAN)) return (0); @@ -1153,7 +1153,7 @@ xmlSchemaValueGetAsBoolean(xmlSchemaValPtr val) * @param value the value * @returns a pointer to the new value or NULL in case of error */ -xmlSchemaValPtr +xmlSchemaVal * xmlSchemaNewStringValue(xmlSchemaValType type, const xmlChar *value) { @@ -1179,7 +1179,7 @@ xmlSchemaNewStringValue(xmlSchemaValType type, * @param ns the notation namespace name or NULL * @returns a pointer to the new value or NULL in case of error */ -xmlSchemaValPtr +xmlSchemaVal * xmlSchemaNewNOTATIONValue(const xmlChar *name, const xmlChar *ns) { @@ -1203,7 +1203,7 @@ xmlSchemaNewNOTATIONValue(const xmlChar *name, * @param localName the local name * @returns a pointer to the new value or NULL in case of an error. */ -xmlSchemaValPtr +xmlSchemaVal * xmlSchemaNewQNameValue(const xmlChar *namespaceName, const xmlChar *localName) { @@ -1224,7 +1224,7 @@ xmlSchemaNewQNameValue(const xmlChar *namespaceName, * @param value the value to free */ void -xmlSchemaFreeValue(xmlSchemaValPtr value) { +xmlSchemaFreeValue(xmlSchemaVal *value) { xmlSchemaValPtr prev; while (value != NULL) { @@ -1295,7 +1295,7 @@ xmlSchemaFreeValue(xmlSchemaValPtr value) { * @param ns the URI of the namespace usually "http://www.w3.org/2001/XMLSchema" * @returns the type if found, NULL otherwise */ -xmlSchemaTypePtr +xmlSchemaType * xmlSchemaGetPredefinedType(const xmlChar *name, const xmlChar *ns) { if ((xmlSchemaTypesInitialized == 0) && (xmlSchemaInitTypes() < 0)) @@ -1312,8 +1312,8 @@ xmlSchemaGetPredefinedType(const xmlChar *name, const xmlChar *ns) { * @returns the item type of `type` as defined by the built-in datatype * hierarchy of XML Schema Part 2: Datatypes, or NULL in case of an error. */ -xmlSchemaTypePtr -xmlSchemaGetBuiltInListSimpleTypeItemType(xmlSchemaTypePtr type) +xmlSchemaType * +xmlSchemaGetBuiltInListSimpleTypeItemType(xmlSchemaType *type) { if ((type == NULL) || (type->type != XML_SCHEMA_TYPE_BASIC)) return (NULL); @@ -3586,8 +3586,8 @@ xmlSchemaValAtomicType(xmlSchemaTypePtr type, const xmlChar * value, * and -1 in case of internal or API error. */ int -xmlSchemaValPredefTypeNode(xmlSchemaTypePtr type, const xmlChar *value, - xmlSchemaValPtr *val, xmlNodePtr node) { +xmlSchemaValPredefTypeNode(xmlSchemaType *type, const xmlChar *value, + xmlSchemaVal **val, xmlNode *node) { return(xmlSchemaValAtomicType(type, value, val, node, 0, XML_SCHEMA_WHITESPACE_UNKNOWN, 1, 1, 0)); } @@ -3605,8 +3605,8 @@ xmlSchemaValPredefTypeNode(xmlSchemaTypePtr type, const xmlChar *value, * and -1 in case of internal or API error. */ int -xmlSchemaValPredefTypeNodeNoNorm(xmlSchemaTypePtr type, const xmlChar *value, - xmlSchemaValPtr *val, xmlNodePtr node) { +xmlSchemaValPredefTypeNodeNoNorm(xmlSchemaType *type, const xmlChar *value, + xmlSchemaVal **val, xmlNode *node) { return(xmlSchemaValAtomicType(type, value, val, node, 1, XML_SCHEMA_WHITESPACE_UNKNOWN, 1, 0, 1)); } @@ -3622,8 +3622,8 @@ xmlSchemaValPredefTypeNodeNoNorm(xmlSchemaTypePtr type, const xmlChar *value, * and -1 in case of internal or API error. */ int -xmlSchemaValidatePredefinedType(xmlSchemaTypePtr type, const xmlChar *value, - xmlSchemaValPtr *val) { +xmlSchemaValidatePredefinedType(xmlSchemaType *type, const xmlChar *value, + xmlSchemaVal **val) { return(xmlSchemaValPredefTypeNode(type, value, val, NULL)); } @@ -3774,8 +3774,8 @@ xmlSchemaDupVal (xmlSchemaValPtr v) * @param val the precomputed value to be copied * @returns the copy or NULL if a copy for a data-type is not implemented. */ -xmlSchemaValPtr -xmlSchemaCopyValue(xmlSchemaValPtr val) +xmlSchemaVal * +xmlSchemaCopyValue(xmlSchemaVal *val) { xmlSchemaValPtr ret = NULL, prev = NULL, cur; @@ -5057,7 +5057,7 @@ xmlSchemaCompareValuesInternal(xmlSchemaValType xtype, * case of error */ int -xmlSchemaCompareValues(xmlSchemaValPtr x, xmlSchemaValPtr y) { +xmlSchemaCompareValues(xmlSchemaVal *x, xmlSchemaVal *y) { xmlSchemaWhitespaceValueType xws, yws; if ((x == NULL) || (y == NULL)) @@ -5091,9 +5091,9 @@ xmlSchemaCompareValues(xmlSchemaValPtr x, xmlSchemaValPtr y) { * case of error */ int -xmlSchemaCompareValuesWhtsp(xmlSchemaValPtr x, +xmlSchemaCompareValuesWhtsp(xmlSchemaVal *x, xmlSchemaWhitespaceValueType xws, - xmlSchemaValPtr y, + xmlSchemaVal *y, xmlSchemaWhitespaceValueType yws) { if ((x == NULL) || (y == NULL)) @@ -5181,7 +5181,7 @@ xmlSchemaNormLen(const xmlChar *value) { * @returns the value as a long */ unsigned long -xmlSchemaGetFacetValueAsULong(xmlSchemaFacetPtr facet) +xmlSchemaGetFacetValueAsULong(xmlSchemaFacet *facet) { /* * TODO: Check if this is a decimal. @@ -5203,7 +5203,7 @@ xmlSchemaGetFacetValueAsULong(xmlSchemaFacetPtr facet) * number otherwise and -1 in case of an internal error. */ int -xmlSchemaValidateListSimpleTypeFacet(xmlSchemaFacetPtr facet, +xmlSchemaValidateListSimpleTypeFacet(xmlSchemaFacet *facet, const xmlChar *value, unsigned long actualLen, unsigned long *expectedLen) @@ -5370,10 +5370,10 @@ xmlSchemaValidateLengthFacetInternal(xmlSchemaFacetPtr facet, * otherwise and -1 in case of an internal or API error. */ int -xmlSchemaValidateLengthFacet(xmlSchemaTypePtr type, - xmlSchemaFacetPtr facet, +xmlSchemaValidateLengthFacet(xmlSchemaType *type, + xmlSchemaFacet *facet, const xmlChar *value, - xmlSchemaValPtr val, + xmlSchemaVal *val, unsigned long *length) { if (type == NULL) @@ -5397,10 +5397,10 @@ xmlSchemaValidateLengthFacet(xmlSchemaTypePtr type, * otherwise and -1 in case of an internal or API error. */ int -xmlSchemaValidateLengthFacetWhtsp(xmlSchemaFacetPtr facet, +xmlSchemaValidateLengthFacetWhtsp(xmlSchemaFacet *facet, xmlSchemaValType valType, const xmlChar *value, - xmlSchemaValPtr val, + xmlSchemaVal *val, unsigned long *length, xmlSchemaWhitespaceValueType ws) { @@ -5653,10 +5653,10 @@ xmlSchemaValidateFacetInternal(xmlSchemaFacetPtr facet, * number otherwise and -1 in case of internal or API error. */ int -xmlSchemaValidateFacet(xmlSchemaTypePtr base, - xmlSchemaFacetPtr facet, +xmlSchemaValidateFacet(xmlSchemaType *base, + xmlSchemaFacet *facet, const xmlChar *value, - xmlSchemaValPtr val) + xmlSchemaVal *val) { /* * This tries to ensure API compatibility regarding the old @@ -5690,11 +5690,11 @@ xmlSchemaValidateFacet(xmlSchemaTypePtr base, * number otherwise and -1 in case of internal or API error. */ int -xmlSchemaValidateFacetWhtsp(xmlSchemaFacetPtr facet, +xmlSchemaValidateFacetWhtsp(xmlSchemaFacet *facet, xmlSchemaWhitespaceValueType fws, xmlSchemaValType valType, const xmlChar *value, - xmlSchemaValPtr val, + xmlSchemaVal *val, xmlSchemaWhitespaceValueType ws) { return(xmlSchemaValidateFacetInternal(facet, fws, valType, @@ -5719,7 +5719,7 @@ xmlSchemaValidateFacetWhtsp(xmlSchemaFacetPtr facet, * not supported yet and -1 in case of API errors. */ int -xmlSchemaGetCanonValue(xmlSchemaValPtr val, const xmlChar **retValue) +xmlSchemaGetCanonValue(xmlSchemaVal *val, const xmlChar **retValue) { if ((retValue == NULL) || (val == NULL)) return (-1); @@ -6049,7 +6049,7 @@ xmlSchemaGetCanonValue(xmlSchemaValPtr val, const xmlChar **retValue) * not supported yet and -1 in case of API errors. */ int -xmlSchemaGetCanonValueWhtsp(xmlSchemaValPtr val, +xmlSchemaGetCanonValueWhtsp(xmlSchemaVal *val, const xmlChar **retValue, xmlSchemaWhitespaceValueType ws) { @@ -6096,7 +6096,7 @@ xmlSchemaGetCanonValueWhtsp(xmlSchemaValPtr val, * @returns the xmlSchemaValType of the value */ xmlSchemaValType -xmlSchemaGetValType(xmlSchemaValPtr val) +xmlSchemaGetValType(xmlSchemaVal *val) { if (val == NULL) return(XML_SCHEMAS_UNKNOWN); diff --git a/xmlwriter.c b/xmlwriter.c index 7eeca65d..cae198ef 100644 --- a/xmlwriter.c +++ b/xmlwriter.c @@ -162,8 +162,8 @@ xmlWriterErrMsgInt(xmlTextWriterPtr ctxt, xmlParserErrors error, * @param out an xmlOutputBufferPtr * @returns the new xmlTextWriterPtr or NULL in case of error */ -xmlTextWriterPtr -xmlNewTextWriter(xmlOutputBufferPtr out) +xmlTextWriter * +xmlNewTextWriter(xmlOutputBuffer *out) { xmlTextWriterPtr ret; @@ -221,7 +221,7 @@ xmlNewTextWriter(xmlOutputBufferPtr out) * @param compression compress the output? * @returns the new xmlTextWriterPtr or NULL in case of error */ -xmlTextWriterPtr +xmlTextWriter * xmlNewTextWriterFilename(const char *uri, int compression) { xmlTextWriterPtr ret; @@ -255,8 +255,8 @@ xmlNewTextWriterFilename(const char *uri, int compression) * @param compression compress the output? * @returns the new xmlTextWriterPtr or NULL in case of error */ -xmlTextWriterPtr -xmlNewTextWriterMemory(xmlBufferPtr buf, int compression ATTRIBUTE_UNUSED) +xmlTextWriter * +xmlNewTextWriterMemory(xmlBuffer *buf, int compression ATTRIBUTE_UNUSED) { xmlTextWriterPtr ret; xmlOutputBufferPtr out; @@ -291,8 +291,8 @@ xmlNewTextWriterMemory(xmlBufferPtr buf, int compression ATTRIBUTE_UNUSED) * @param compression compress the output? * @returns the new xmlTextWriterPtr or NULL in case of error */ -xmlTextWriterPtr -xmlNewTextWriterPushParser(xmlParserCtxtPtr ctxt, +xmlTextWriter * +xmlNewTextWriterPushParser(xmlParserCtxt *ctxt, int compression ATTRIBUTE_UNUSED) { xmlTextWriterPtr ret; @@ -333,8 +333,8 @@ xmlNewTextWriterPushParser(xmlParserCtxtPtr ctxt, * @param compression compress the output? * @returns the new xmlTextWriterPtr or NULL in case of error */ -xmlTextWriterPtr -xmlNewTextWriterDoc(xmlDocPtr * doc, int compression) +xmlTextWriter * +xmlNewTextWriterDoc(xmlDoc ** doc, int compression) { xmlTextWriterPtr ret; xmlSAXHandler saxHandler; @@ -392,8 +392,8 @@ xmlNewTextWriterDoc(xmlDocPtr * doc, int compression) * @param compression compress the output? * @returns the new xmlTextWriterPtr or NULL in case of error */ -xmlTextWriterPtr -xmlNewTextWriterTree(xmlDocPtr doc, xmlNodePtr node, int compression) +xmlTextWriter * +xmlNewTextWriterTree(xmlDoc *doc, xmlNode *node, int compression) { xmlTextWriterPtr ret; xmlSAXHandler saxHandler; @@ -444,7 +444,7 @@ xmlNewTextWriterTree(xmlDocPtr doc, xmlNodePtr node, int compression) * @param writer the xmlTextWriterPtr */ void -xmlFreeTextWriter(xmlTextWriterPtr writer) +xmlFreeTextWriter(xmlTextWriter *writer) { if (writer == NULL) return; @@ -484,7 +484,7 @@ xmlFreeTextWriter(xmlTextWriterPtr writer) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterStartDocument(xmlTextWriterPtr writer, const char *version, +xmlTextWriterStartDocument(xmlTextWriter *writer, const char *version, const char *encoding, const char *standalone) { int count; @@ -602,7 +602,7 @@ xmlTextWriterStartDocument(xmlTextWriterPtr writer, const char *version, * @returns the bytes written or -1 in case of error */ int -xmlTextWriterEndDocument(xmlTextWriterPtr writer) +xmlTextWriterEndDocument(xmlTextWriter *writer) { int count; int sum; @@ -690,7 +690,7 @@ xmlTextWriterEndDocument(xmlTextWriterPtr writer) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterStartComment(xmlTextWriterPtr writer) +xmlTextWriterStartComment(xmlTextWriter *writer) { int count; int sum; @@ -772,7 +772,7 @@ xmlTextWriterStartComment(xmlTextWriterPtr writer) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterEndComment(xmlTextWriterPtr writer) +xmlTextWriterEndComment(xmlTextWriter *writer) { int count; int sum; @@ -828,7 +828,7 @@ xmlTextWriterEndComment(xmlTextWriterPtr writer) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteFormatComment(xmlTextWriterPtr writer, +xmlTextWriterWriteFormatComment(xmlTextWriter *writer, const char *format, ...) { int rc; @@ -851,7 +851,7 @@ xmlTextWriterWriteFormatComment(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteVFormatComment(xmlTextWriterPtr writer, +xmlTextWriterWriteVFormatComment(xmlTextWriter *writer, const char *format, va_list argptr) { int rc; @@ -881,7 +881,7 @@ xmlTextWriterWriteVFormatComment(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteComment(xmlTextWriterPtr writer, const xmlChar * content) +xmlTextWriterWriteComment(xmlTextWriter *writer, const xmlChar * content) { int count; int sum; @@ -911,7 +911,7 @@ xmlTextWriterWriteComment(xmlTextWriterPtr writer, const xmlChar * content) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterStartElement(xmlTextWriterPtr writer, const xmlChar * name) +xmlTextWriterStartElement(xmlTextWriter *writer, const xmlChar * name) { int count; int sum; @@ -1006,7 +1006,7 @@ xmlTextWriterStartElement(xmlTextWriterPtr writer, const xmlChar * name) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterStartElementNS(xmlTextWriterPtr writer, +xmlTextWriterStartElementNS(xmlTextWriter *writer, const xmlChar * prefix, const xmlChar * name, const xmlChar * namespaceURI) { @@ -1069,7 +1069,7 @@ xmlTextWriterStartElementNS(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterEndElement(xmlTextWriterPtr writer) +xmlTextWriterEndElement(xmlTextWriter *writer) { int count; int sum; @@ -1159,7 +1159,7 @@ xmlTextWriterEndElement(xmlTextWriterPtr writer) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterFullEndElement(xmlTextWriterPtr writer) +xmlTextWriterFullEndElement(xmlTextWriter *writer) { int count; int sum; @@ -1242,7 +1242,7 @@ xmlTextWriterFullEndElement(xmlTextWriterPtr writer) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteFormatRaw(xmlTextWriterPtr writer, const char *format, +xmlTextWriterWriteFormatRaw(xmlTextWriter *writer, const char *format, ...) { int rc; @@ -1265,7 +1265,7 @@ xmlTextWriterWriteFormatRaw(xmlTextWriterPtr writer, const char *format, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteVFormatRaw(xmlTextWriterPtr writer, const char *format, +xmlTextWriterWriteVFormatRaw(xmlTextWriter *writer, const char *format, va_list argptr) { int rc; @@ -1294,7 +1294,7 @@ xmlTextWriterWriteVFormatRaw(xmlTextWriterPtr writer, const char *format, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteRawLen(xmlTextWriterPtr writer, const xmlChar * content, +xmlTextWriterWriteRawLen(xmlTextWriter *writer, const xmlChar * content, int len) { int count; @@ -1346,7 +1346,7 @@ xmlTextWriterWriteRawLen(xmlTextWriterPtr writer, const xmlChar * content, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteRaw(xmlTextWriterPtr writer, const xmlChar * content) +xmlTextWriterWriteRaw(xmlTextWriter *writer, const xmlChar * content) { return xmlTextWriterWriteRawLen(writer, content, xmlStrlen(content)); } @@ -1360,7 +1360,7 @@ xmlTextWriterWriteRaw(xmlTextWriterPtr writer, const xmlChar * content) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteFormatString(xmlTextWriterPtr writer, const char *format, +xmlTextWriterWriteFormatString(xmlTextWriter *writer, const char *format, ...) { int rc; @@ -1386,7 +1386,7 @@ xmlTextWriterWriteFormatString(xmlTextWriterPtr writer, const char *format, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteVFormatString(xmlTextWriterPtr writer, +xmlTextWriterWriteVFormatString(xmlTextWriter *writer, const char *format, va_list argptr) { int rc; @@ -1413,7 +1413,7 @@ xmlTextWriterWriteVFormatString(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteString(xmlTextWriterPtr writer, const xmlChar * content) +xmlTextWriterWriteString(xmlTextWriter *writer, const xmlChar * content) { int count; int sum; @@ -1553,7 +1553,7 @@ xmlOutputBufferWriteBase64(xmlOutputBufferPtr out, int len, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteBase64(xmlTextWriterPtr writer, const char *data, +xmlTextWriterWriteBase64(xmlTextWriter *writer, const char *data, int start, int len) { int count; @@ -1641,7 +1641,7 @@ xmlOutputBufferWriteBinHex(xmlOutputBufferPtr out, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteBinHex(xmlTextWriterPtr writer, const char *data, +xmlTextWriterWriteBinHex(xmlTextWriter *writer, const char *data, int start, int len) { int count; @@ -1685,7 +1685,7 @@ xmlTextWriterWriteBinHex(xmlTextWriterPtr writer, const char *data, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterStartAttribute(xmlTextWriterPtr writer, const xmlChar * name) +xmlTextWriterStartAttribute(xmlTextWriter *writer, const xmlChar * name) { int count; int sum; @@ -1749,7 +1749,7 @@ xmlTextWriterStartAttribute(xmlTextWriterPtr writer, const xmlChar * name) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterStartAttributeNS(xmlTextWriterPtr writer, +xmlTextWriterStartAttributeNS(xmlTextWriter *writer, const xmlChar * prefix, const xmlChar * name, const xmlChar * namespaceURI) { @@ -1836,7 +1836,7 @@ xmlTextWriterStartAttributeNS(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterEndAttribute(xmlTextWriterPtr writer) +xmlTextWriterEndAttribute(xmlTextWriter *writer) { int count; int sum; @@ -1884,7 +1884,7 @@ xmlTextWriterEndAttribute(xmlTextWriterPtr writer) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteFormatAttribute(xmlTextWriterPtr writer, +xmlTextWriterWriteFormatAttribute(xmlTextWriter *writer, const xmlChar * name, const char *format, ...) { @@ -1909,7 +1909,7 @@ xmlTextWriterWriteFormatAttribute(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteVFormatAttribute(xmlTextWriterPtr writer, +xmlTextWriterWriteVFormatAttribute(xmlTextWriter *writer, const xmlChar * name, const char *format, va_list argptr) { @@ -1938,7 +1938,7 @@ xmlTextWriterWriteVFormatAttribute(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteAttribute(xmlTextWriterPtr writer, const xmlChar * name, +xmlTextWriterWriteAttribute(xmlTextWriter *writer, const xmlChar * name, const xmlChar * content) { int count; @@ -1973,7 +1973,7 @@ xmlTextWriterWriteAttribute(xmlTextWriterPtr writer, const xmlChar * name, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteFormatAttributeNS(xmlTextWriterPtr writer, +xmlTextWriterWriteFormatAttributeNS(xmlTextWriter *writer, const xmlChar * prefix, const xmlChar * name, const xmlChar * namespaceURI, @@ -2003,7 +2003,7 @@ xmlTextWriterWriteFormatAttributeNS(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteVFormatAttributeNS(xmlTextWriterPtr writer, +xmlTextWriterWriteVFormatAttributeNS(xmlTextWriter *writer, const xmlChar * prefix, const xmlChar * name, const xmlChar * namespaceURI, @@ -2037,7 +2037,7 @@ xmlTextWriterWriteVFormatAttributeNS(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteAttributeNS(xmlTextWriterPtr writer, +xmlTextWriterWriteAttributeNS(xmlTextWriter *writer, const xmlChar * prefix, const xmlChar * name, const xmlChar * namespaceURI, const xmlChar * content) @@ -2075,7 +2075,7 @@ xmlTextWriterWriteAttributeNS(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteFormatElement(xmlTextWriterPtr writer, +xmlTextWriterWriteFormatElement(xmlTextWriter *writer, const xmlChar * name, const char *format, ...) { @@ -2100,7 +2100,7 @@ xmlTextWriterWriteFormatElement(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteVFormatElement(xmlTextWriterPtr writer, +xmlTextWriterWriteVFormatElement(xmlTextWriter *writer, const xmlChar * name, const char *format, va_list argptr) { @@ -2129,7 +2129,7 @@ xmlTextWriterWriteVFormatElement(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteElement(xmlTextWriterPtr writer, const xmlChar * name, +xmlTextWriterWriteElement(xmlTextWriter *writer, const xmlChar * name, const xmlChar * content) { int count; @@ -2166,7 +2166,7 @@ xmlTextWriterWriteElement(xmlTextWriterPtr writer, const xmlChar * name, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteFormatElementNS(xmlTextWriterPtr writer, +xmlTextWriterWriteFormatElementNS(xmlTextWriter *writer, const xmlChar * prefix, const xmlChar * name, const xmlChar * namespaceURI, @@ -2196,7 +2196,7 @@ xmlTextWriterWriteFormatElementNS(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteVFormatElementNS(xmlTextWriterPtr writer, +xmlTextWriterWriteVFormatElementNS(xmlTextWriter *writer, const xmlChar * prefix, const xmlChar * name, const xmlChar * namespaceURI, @@ -2230,7 +2230,7 @@ xmlTextWriterWriteVFormatElementNS(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteElementNS(xmlTextWriterPtr writer, +xmlTextWriterWriteElementNS(xmlTextWriter *writer, const xmlChar * prefix, const xmlChar * name, const xmlChar * namespaceURI, const xmlChar * content) @@ -2267,7 +2267,7 @@ xmlTextWriterWriteElementNS(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterStartPI(xmlTextWriterPtr writer, const xmlChar * target) +xmlTextWriterStartPI(xmlTextWriter *writer, const xmlChar * target) { int count; int sum; @@ -2361,7 +2361,7 @@ xmlTextWriterStartPI(xmlTextWriterPtr writer, const xmlChar * target) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterEndPI(xmlTextWriterPtr writer) +xmlTextWriterEndPI(xmlTextWriter *writer) { int count; int sum; @@ -2413,7 +2413,7 @@ xmlTextWriterEndPI(xmlTextWriterPtr writer) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteFormatPI(xmlTextWriterPtr writer, const xmlChar * target, +xmlTextWriterWriteFormatPI(xmlTextWriter *writer, const xmlChar * target, const char *format, ...) { int rc; @@ -2437,7 +2437,7 @@ xmlTextWriterWriteFormatPI(xmlTextWriterPtr writer, const xmlChar * target, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteVFormatPI(xmlTextWriterPtr writer, +xmlTextWriterWriteVFormatPI(xmlTextWriter *writer, const xmlChar * target, const char *format, va_list argptr) { @@ -2466,7 +2466,7 @@ xmlTextWriterWriteVFormatPI(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWritePI(xmlTextWriterPtr writer, const xmlChar * target, +xmlTextWriterWritePI(xmlTextWriter *writer, const xmlChar * target, const xmlChar * content) { int count; @@ -2498,7 +2498,7 @@ xmlTextWriterWritePI(xmlTextWriterPtr writer, const xmlChar * target, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterStartCDATA(xmlTextWriterPtr writer) +xmlTextWriterStartCDATA(xmlTextWriter *writer) { int count; int sum; @@ -2575,7 +2575,7 @@ xmlTextWriterStartCDATA(xmlTextWriterPtr writer) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterEndCDATA(xmlTextWriterPtr writer) +xmlTextWriterEndCDATA(xmlTextWriter *writer) { int count; int sum; @@ -2618,7 +2618,7 @@ xmlTextWriterEndCDATA(xmlTextWriterPtr writer) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteFormatCDATA(xmlTextWriterPtr writer, const char *format, +xmlTextWriterWriteFormatCDATA(xmlTextWriter *writer, const char *format, ...) { int rc; @@ -2641,7 +2641,7 @@ xmlTextWriterWriteFormatCDATA(xmlTextWriterPtr writer, const char *format, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteVFormatCDATA(xmlTextWriterPtr writer, const char *format, +xmlTextWriterWriteVFormatCDATA(xmlTextWriter *writer, const char *format, va_list argptr) { int rc; @@ -2668,7 +2668,7 @@ xmlTextWriterWriteVFormatCDATA(xmlTextWriterPtr writer, const char *format, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteCDATA(xmlTextWriterPtr writer, const xmlChar * content) +xmlTextWriterWriteCDATA(xmlTextWriter *writer, const xmlChar * content) { int count; int sum; @@ -2702,7 +2702,7 @@ xmlTextWriterWriteCDATA(xmlTextWriterPtr writer, const xmlChar * content) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterStartDTD(xmlTextWriterPtr writer, +xmlTextWriterStartDTD(xmlTextWriter *writer, const xmlChar * name, const xmlChar * pubid, const xmlChar * sysid) { @@ -2837,7 +2837,7 @@ xmlTextWriterStartDTD(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterEndDTD(xmlTextWriterPtr writer) +xmlTextWriterEndDTD(xmlTextWriter *writer) { int loop; int count; @@ -2917,7 +2917,7 @@ xmlTextWriterEndDTD(xmlTextWriterPtr writer) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteFormatDTD(xmlTextWriterPtr writer, +xmlTextWriterWriteFormatDTD(xmlTextWriter *writer, const xmlChar * name, const xmlChar * pubid, const xmlChar * sysid, const char *format, ...) @@ -2946,7 +2946,7 @@ xmlTextWriterWriteFormatDTD(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteVFormatDTD(xmlTextWriterPtr writer, +xmlTextWriterWriteVFormatDTD(xmlTextWriter *writer, const xmlChar * name, const xmlChar * pubid, const xmlChar * sysid, @@ -2979,7 +2979,7 @@ xmlTextWriterWriteVFormatDTD(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteDTD(xmlTextWriterPtr writer, +xmlTextWriterWriteDTD(xmlTextWriter *writer, const xmlChar * name, const xmlChar * pubid, const xmlChar * sysid, const xmlChar * subset) @@ -3014,7 +3014,7 @@ xmlTextWriterWriteDTD(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterStartDTDElement(xmlTextWriterPtr writer, const xmlChar * name) +xmlTextWriterStartDTDElement(xmlTextWriter *writer, const xmlChar * name) { int count; int sum; @@ -3099,7 +3099,7 @@ xmlTextWriterStartDTDElement(xmlTextWriterPtr writer, const xmlChar * name) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterEndDTDElement(xmlTextWriterPtr writer) +xmlTextWriterEndDTDElement(xmlTextWriter *writer) { int count; int sum; @@ -3151,7 +3151,7 @@ xmlTextWriterEndDTDElement(xmlTextWriterPtr writer) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteFormatDTDElement(xmlTextWriterPtr writer, +xmlTextWriterWriteFormatDTDElement(xmlTextWriter *writer, const xmlChar * name, const char *format, ...) { @@ -3176,7 +3176,7 @@ xmlTextWriterWriteFormatDTDElement(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteVFormatDTDElement(xmlTextWriterPtr writer, +xmlTextWriterWriteVFormatDTDElement(xmlTextWriter *writer, const xmlChar * name, const char *format, va_list argptr) { @@ -3205,7 +3205,7 @@ xmlTextWriterWriteVFormatDTDElement(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteDTDElement(xmlTextWriterPtr writer, +xmlTextWriterWriteDTDElement(xmlTextWriter *writer, const xmlChar * name, const xmlChar * content) { int count; @@ -3241,7 +3241,7 @@ xmlTextWriterWriteDTDElement(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterStartDTDAttlist(xmlTextWriterPtr writer, const xmlChar * name) +xmlTextWriterStartDTDAttlist(xmlTextWriter *writer, const xmlChar * name) { int count; int sum; @@ -3326,7 +3326,7 @@ xmlTextWriterStartDTDAttlist(xmlTextWriterPtr writer, const xmlChar * name) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterEndDTDAttlist(xmlTextWriterPtr writer) +xmlTextWriterEndDTDAttlist(xmlTextWriter *writer) { int count; int sum; @@ -3378,7 +3378,7 @@ xmlTextWriterEndDTDAttlist(xmlTextWriterPtr writer) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteFormatDTDAttlist(xmlTextWriterPtr writer, +xmlTextWriterWriteFormatDTDAttlist(xmlTextWriter *writer, const xmlChar * name, const char *format, ...) { @@ -3403,7 +3403,7 @@ xmlTextWriterWriteFormatDTDAttlist(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteVFormatDTDAttlist(xmlTextWriterPtr writer, +xmlTextWriterWriteVFormatDTDAttlist(xmlTextWriter *writer, const xmlChar * name, const char *format, va_list argptr) { @@ -3432,7 +3432,7 @@ xmlTextWriterWriteVFormatDTDAttlist(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteDTDAttlist(xmlTextWriterPtr writer, +xmlTextWriterWriteDTDAttlist(xmlTextWriter *writer, const xmlChar * name, const xmlChar * content) { int count; @@ -3469,7 +3469,7 @@ xmlTextWriterWriteDTDAttlist(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterStartDTDEntity(xmlTextWriterPtr writer, +xmlTextWriterStartDTDEntity(xmlTextWriter *writer, int pe, const xmlChar * name) { int count; @@ -3567,7 +3567,7 @@ xmlTextWriterStartDTDEntity(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterEndDTDEntity(xmlTextWriterPtr writer) +xmlTextWriterEndDTDEntity(xmlTextWriter *writer) { int count; int sum; @@ -3626,7 +3626,7 @@ xmlTextWriterEndDTDEntity(xmlTextWriterPtr writer) * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteFormatDTDInternalEntity(xmlTextWriterPtr writer, +xmlTextWriterWriteFormatDTDInternalEntity(xmlTextWriter *writer, int pe, const xmlChar * name, const char *format, ...) @@ -3654,7 +3654,7 @@ xmlTextWriterWriteFormatDTDInternalEntity(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteVFormatDTDInternalEntity(xmlTextWriterPtr writer, +xmlTextWriterWriteVFormatDTDInternalEntity(xmlTextWriter *writer, int pe, const xmlChar * name, const char *format, @@ -3689,7 +3689,7 @@ xmlTextWriterWriteVFormatDTDInternalEntity(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteDTDEntity(xmlTextWriterPtr writer, +xmlTextWriterWriteDTDEntity(xmlTextWriter *writer, int pe, const xmlChar * name, const xmlChar * pubid, @@ -3720,7 +3720,7 @@ xmlTextWriterWriteDTDEntity(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteDTDInternalEntity(xmlTextWriterPtr writer, +xmlTextWriterWriteDTDInternalEntity(xmlTextWriter *writer, int pe, const xmlChar * name, const xmlChar * content) @@ -3762,7 +3762,7 @@ xmlTextWriterWriteDTDInternalEntity(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteDTDExternalEntity(xmlTextWriterPtr writer, +xmlTextWriterWriteDTDExternalEntity(xmlTextWriter *writer, int pe, const xmlChar * name, const xmlChar * pubid, @@ -3808,7 +3808,7 @@ xmlTextWriterWriteDTDExternalEntity(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteDTDExternalEntityContents(xmlTextWriterPtr writer, +xmlTextWriterWriteDTDExternalEntityContents(xmlTextWriter *writer, const xmlChar * pubid, const xmlChar * sysid, const xmlChar * ndataid) @@ -3938,7 +3938,7 @@ xmlTextWriterWriteDTDExternalEntityContents(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterWriteDTDNotation(xmlTextWriterPtr writer, +xmlTextWriterWriteDTDNotation(xmlTextWriter *writer, const xmlChar * name, const xmlChar * pubid, const xmlChar * sysid) { @@ -4056,7 +4056,7 @@ xmlTextWriterWriteDTDNotation(xmlTextWriterPtr writer, * @returns the bytes written (may be 0 because of buffering) or -1 in case of error */ int -xmlTextWriterFlush(xmlTextWriterPtr writer) +xmlTextWriterFlush(xmlTextWriter *writer) { int count; @@ -4080,7 +4080,7 @@ xmlTextWriterFlush(xmlTextWriterPtr writer) * @returns an xmlParserErrors code. */ int -xmlTextWriterClose(xmlTextWriterPtr writer) +xmlTextWriterClose(xmlTextWriter *writer) { int result; @@ -4399,7 +4399,7 @@ xmlTextWriterStartDocumentCallback(void *ctx) * @returns -1 on error or 0 otherwise. */ int -xmlTextWriterSetIndent(xmlTextWriterPtr writer, int indent) +xmlTextWriterSetIndent(xmlTextWriter *writer, int indent) { if ((writer == NULL) || (indent < 0)) return -1; @@ -4418,7 +4418,7 @@ xmlTextWriterSetIndent(xmlTextWriterPtr writer, int indent) * @returns -1 on error or 0 otherwise. */ int -xmlTextWriterSetIndentString(xmlTextWriterPtr writer, const xmlChar * str) +xmlTextWriterSetIndentString(xmlTextWriter *writer, const xmlChar * str) { if ((writer == NULL) || (!str)) return -1; @@ -4441,7 +4441,7 @@ xmlTextWriterSetIndentString(xmlTextWriterPtr writer, const xmlChar * str) * @returns -1 on error or 0 otherwise. */ int -xmlTextWriterSetQuoteChar(xmlTextWriterPtr writer, xmlChar quotechar) +xmlTextWriterSetQuoteChar(xmlTextWriter *writer, xmlChar quotechar) { if ((writer == NULL) || ((quotechar != '\'') && (quotechar != '"'))) return -1; diff --git a/xpath.c b/xpath.c index 23ad739c..d42b4b11 100644 --- a/xpath.c +++ b/xpath.c @@ -672,7 +672,7 @@ static const char* const xmlXPathErrorMessages[] = { * @param ctxt an XPath context */ void -xmlXPathErrMemory(xmlXPathContextPtr ctxt) +xmlXPathErrMemory(xmlXPathContext *ctxt) { if (ctxt == NULL) return; @@ -686,7 +686,7 @@ xmlXPathErrMemory(xmlXPathContextPtr ctxt) * @param ctxt an XPath parser context */ void -xmlXPathPErrMemory(xmlXPathParserContextPtr ctxt) +xmlXPathPErrMemory(xmlXPathParserContext *ctxt) { if (ctxt == NULL) return; @@ -701,7 +701,7 @@ xmlXPathPErrMemory(xmlXPathParserContextPtr ctxt) * @param code the error code */ void -xmlXPathErr(xmlXPathParserContextPtr ctxt, int code) +xmlXPathErr(xmlXPathParserContext *ctxt, int code) { xmlStructuredErrorFunc schannel = NULL; xmlGenericErrorFunc channel = NULL; @@ -771,7 +771,7 @@ xmlXPathErr(xmlXPathParserContextPtr ctxt, int code) * @param no the error number */ void -xmlXPatherror(xmlXPathParserContextPtr ctxt, const char *file ATTRIBUTE_UNUSED, +xmlXPatherror(xmlXPathParserContext *ctxt, const char *file ATTRIBUTE_UNUSED, int line ATTRIBUTE_UNUSED, int no) { xmlXPathErr(ctxt, no); } @@ -951,7 +951,7 @@ xmlXPathNewCompExpr(void) { * @param comp an XPATH comp */ void -xmlXPathFreeCompExpr(xmlXPathCompExprPtr comp) +xmlXPathFreeCompExpr(xmlXPathCompExpr *comp) { xmlXPathStepOpPtr op; int i; @@ -1207,7 +1207,7 @@ xmlXPathDebugDumpValueTree(FILE *output, xmlNodeSetPtr cur, int depth) { * @param depth indentation level */ void -xmlXPathDebugDumpObject(FILE *output, xmlXPathObjectPtr cur, int depth) { +xmlXPathDebugDumpObject(FILE *output, xmlXPathObject *cur, int depth) { int i; char shift[100]; @@ -1455,7 +1455,7 @@ finish: * @param depth the indentation level. */ void -xmlXPathDebugDumpCompExpr(FILE *output, xmlXPathCompExprPtr comp, +xmlXPathDebugDumpCompExpr(FILE *output, xmlXPathCompExpr *comp, int depth) { int i; char shift[100]; @@ -1558,7 +1558,7 @@ xmlXPathFreeCache(xmlXPathContextCachePtr cache) * @returns 0 if the setting succeeded, and -1 on API or internal errors. */ int -xmlXPathContextSetCache(xmlXPathContextPtr ctxt, +xmlXPathContextSetCache(xmlXPathContext *ctxt, int active, int value, int options) @@ -1958,8 +1958,8 @@ xmlXPathCastToNumberInternal(xmlXPathParserContextPtr ctxt, * @param ctxt an XPath evaluation context * @returns the XPath object just removed */ -xmlXPathObjectPtr -xmlXPathValuePop(xmlXPathParserContextPtr ctxt) +xmlXPathObject * +xmlXPathValuePop(xmlXPathParserContext *ctxt) { xmlXPathObjectPtr ret; @@ -1987,7 +1987,7 @@ xmlXPathValuePop(xmlXPathParserContextPtr ctxt) * @returns the number of items on the value stack, or -1 in case of error. */ int -xmlXPathValuePush(xmlXPathParserContextPtr ctxt, xmlXPathObjectPtr value) +xmlXPathValuePush(xmlXPathParserContext *ctxt, xmlXPathObject *value) { if (ctxt == NULL) return(-1); if (value == NULL) { @@ -2030,7 +2030,7 @@ xmlXPathValuePush(xmlXPathParserContextPtr ctxt, xmlXPathObjectPtr value) * @returns the boolean */ int -xmlXPathPopBoolean (xmlXPathParserContextPtr ctxt) { +xmlXPathPopBoolean (xmlXPathParserContext *ctxt) { xmlXPathObjectPtr obj; int ret; @@ -2055,7 +2055,7 @@ xmlXPathPopBoolean (xmlXPathParserContextPtr ctxt) { * @returns the number */ double -xmlXPathPopNumber (xmlXPathParserContextPtr ctxt) { +xmlXPathPopNumber (xmlXPathParserContext *ctxt) { xmlXPathObjectPtr obj; double ret; @@ -2080,7 +2080,7 @@ xmlXPathPopNumber (xmlXPathParserContextPtr ctxt) { * @returns the string */ xmlChar * -xmlXPathPopString (xmlXPathParserContextPtr ctxt) { +xmlXPathPopString (xmlXPathParserContext *ctxt) { xmlXPathObjectPtr obj; xmlChar * ret; @@ -2103,8 +2103,8 @@ xmlXPathPopString (xmlXPathParserContextPtr ctxt) { * @param ctxt an XPath parser context * @returns the node-set */ -xmlNodeSetPtr -xmlXPathPopNodeSet (xmlXPathParserContextPtr ctxt) { +xmlNodeSet * +xmlXPathPopNodeSet (xmlXPathParserContext *ctxt) { xmlXPathObjectPtr obj; xmlNodeSetPtr ret; @@ -2132,7 +2132,7 @@ xmlXPathPopNodeSet (xmlXPathParserContextPtr ctxt) { * @returns the object */ void * -xmlXPathPopExternal (xmlXPathParserContextPtr ctxt) { +xmlXPathPopExternal (xmlXPathParserContext *ctxt) { xmlXPathObjectPtr obj; void * ret; @@ -2352,7 +2352,7 @@ xmlXPathFormatNumber(double number, char buffer[], int buffersize) * of error. */ long -xmlXPathOrderDocElems(xmlDocPtr doc) { +xmlXPathOrderDocElems(xmlDoc *doc) { XML_INTPTR_T count = 0; xmlNodePtr cur; @@ -2398,7 +2398,7 @@ xmlXPathOrderDocElems(xmlDocPtr doc) { * it's the same node, -1 otherwise */ int -xmlXPathCmpNodes(xmlNodePtr node1, xmlNodePtr node2) { +xmlXPathCmpNodes(xmlNode *node1, xmlNode *node2) { int depth1, depth2; int attr1 = 0, attr2 = 0; xmlNodePtr attrNode1 = NULL, attrNode2 = NULL; @@ -2540,7 +2540,7 @@ xmlXPathCmpNodes(xmlNodePtr node1, xmlNodePtr node2) { * @param set the node set */ void -xmlXPathNodeSetSort(xmlNodeSetPtr set) { +xmlXPathNodeSetSort(xmlNodeSet *set) { #ifndef WITH_TIM_SORT int i, j, incr, len; xmlNodePtr tmp; @@ -2635,7 +2635,7 @@ xmlXPathNodeSetDupNs(xmlNodePtr node, xmlNsPtr ns) { * @param ns the XPath namespace node found in a nodeset. */ void -xmlXPathNodeSetFreeNs(xmlNsPtr ns) { +xmlXPathNodeSetFreeNs(xmlNs *ns) { if ((ns == NULL) || (ns->type != XML_NAMESPACE_DECL)) return; @@ -2654,8 +2654,8 @@ xmlXPathNodeSetFreeNs(xmlNsPtr ns) { * @param val an initial xmlNodePtr, or NULL * @returns the newly created object. */ -xmlNodeSetPtr -xmlXPathNodeSetCreate(xmlNodePtr val) { +xmlNodeSet * +xmlXPathNodeSetCreate(xmlNode *val) { xmlNodeSetPtr ret; ret = (xmlNodeSetPtr) xmlMalloc(sizeof(xmlNodeSet)); @@ -2695,7 +2695,7 @@ xmlXPathNodeSetCreate(xmlNodePtr val) { * @returns true (1) if `cur` contains `val`, false (0) otherwise */ int -xmlXPathNodeSetContains (xmlNodeSetPtr cur, xmlNodePtr val) { +xmlXPathNodeSetContains (xmlNodeSet *cur, xmlNode *val) { int i; if ((cur == NULL) || (val == NULL)) return(0); @@ -2749,7 +2749,7 @@ xmlXPathNodeSetGrow(xmlNodeSetPtr cur) { * @returns 0 in case of success and -1 in case of error */ int -xmlXPathNodeSetAddNs(xmlNodeSetPtr cur, xmlNodePtr node, xmlNsPtr ns) { +xmlXPathNodeSetAddNs(xmlNodeSet *cur, xmlNode *node, xmlNs *ns) { int i; xmlNodePtr nsNode; @@ -2792,7 +2792,7 @@ xmlXPathNodeSetAddNs(xmlNodeSetPtr cur, xmlNodePtr node, xmlNsPtr ns) { * @returns 0 in case of success, and -1 in case of error */ int -xmlXPathNodeSetAdd(xmlNodeSetPtr cur, xmlNodePtr val) { +xmlXPathNodeSetAdd(xmlNodeSet *cur, xmlNode *val) { int i; if ((cur == NULL) || (val == NULL)) return(-1); @@ -2833,7 +2833,7 @@ xmlXPathNodeSetAdd(xmlNodeSetPtr cur, xmlNodePtr val) { * @returns 0 in case of success and -1 in case of failure */ int -xmlXPathNodeSetAddUnique(xmlNodeSetPtr cur, xmlNodePtr val) { +xmlXPathNodeSetAddUnique(xmlNodeSet *cur, xmlNode *val) { if ((cur == NULL) || (val == NULL)) return(-1); /* @@ with_ns to check whether namespace nodes should be looked at @@ */ @@ -2867,8 +2867,8 @@ xmlXPathNodeSetAddUnique(xmlNodeSetPtr cur, xmlNodePtr val) { * @param val2 the second NodeSet * @returns `val1` once extended or NULL in case of error. */ -xmlNodeSetPtr -xmlXPathNodeSetMerge(xmlNodeSetPtr val1, xmlNodeSetPtr val2) { +xmlNodeSet * +xmlXPathNodeSetMerge(xmlNodeSet *val1, xmlNodeSet *val2) { int i, j, initNr, skip; xmlNodePtr n1, n2; @@ -3040,7 +3040,7 @@ error: * @param val an xmlNodePtr */ void -xmlXPathNodeSetDel(xmlNodeSetPtr cur, xmlNodePtr val) { +xmlXPathNodeSetDel(xmlNodeSet *cur, xmlNode *val) { int i; if (cur == NULL) return; @@ -3071,7 +3071,7 @@ xmlXPathNodeSetDel(xmlNodeSetPtr cur, xmlNodePtr val) { * @param val the index to remove */ void -xmlXPathNodeSetRemove(xmlNodeSetPtr cur, int val) { +xmlXPathNodeSetRemove(xmlNodeSet *cur, int val) { if (cur == NULL) return; if (val >= cur->nodeNr) return; if ((cur->nodeTab[val] != NULL) && @@ -3089,7 +3089,7 @@ xmlXPathNodeSetRemove(xmlNodeSetPtr cur, int val) { * @param obj the xmlNodeSetPtr to free */ void -xmlXPathFreeNodeSet(xmlNodeSetPtr obj) { +xmlXPathFreeNodeSet(xmlNodeSet *obj) { if (obj == NULL) return; if (obj->nodeTab != NULL) { int i; @@ -3178,8 +3178,8 @@ xmlXPathNodeSetKeepLast(xmlNodeSetPtr set) * @param val the NodePtr value * @returns the newly created object. */ -xmlXPathObjectPtr -xmlXPathNewNodeSet(xmlNodePtr val) { +xmlXPathObject * +xmlXPathNewNodeSet(xmlNode *val) { xmlXPathObjectPtr ret; ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); @@ -3204,8 +3204,8 @@ xmlXPathNewNodeSet(xmlNodePtr val) { * @param val the NodePtr value * @returns the newly created object. */ -xmlXPathObjectPtr -xmlXPathNewValueTree(xmlNodePtr val) { +xmlXPathObject * +xmlXPathNewValueTree(xmlNode *val) { xmlXPathObjectPtr ret; ret = xmlXPathNewNodeSet(val); @@ -3223,8 +3223,8 @@ xmlXPathNewValueTree(xmlNodePtr val) { * @param val an existing NodeSet * @returns the newly created object. */ -xmlXPathObjectPtr -xmlXPathNewNodeSetList(xmlNodeSetPtr val) +xmlXPathObject * +xmlXPathNewNodeSetList(xmlNodeSet *val) { xmlXPathObjectPtr ret; @@ -3254,8 +3254,8 @@ xmlXPathNewNodeSetList(xmlNodeSetPtr val) * @param val the NodePtr value * @returns the newly created object. */ -xmlXPathObjectPtr -xmlXPathWrapNodeSet(xmlNodeSetPtr val) { +xmlXPathObject * +xmlXPathWrapNodeSet(xmlNodeSet *val) { xmlXPathObjectPtr ret; ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); @@ -3276,7 +3276,7 @@ xmlXPathWrapNodeSet(xmlNodeSetPtr val) { * @param obj an existing NodeSetList object */ void -xmlXPathFreeNodeSetList(xmlXPathObjectPtr obj) { +xmlXPathFreeNodeSetList(xmlXPathObject *obj) { if (obj == NULL) return; xmlFree(obj); } @@ -3290,8 +3290,8 @@ xmlXPathFreeNodeSetList(xmlXPathObjectPtr obj) { * @returns the difference between the two node sets, or nodes1 if * nodes2 is empty */ -xmlNodeSetPtr -xmlXPathDifference (xmlNodeSetPtr nodes1, xmlNodeSetPtr nodes2) { +xmlNodeSet * +xmlXPathDifference (xmlNodeSet *nodes1, xmlNodeSet *nodes2) { xmlNodeSetPtr ret; int i, l1; xmlNodePtr cur; @@ -3328,8 +3328,8 @@ xmlXPathDifference (xmlNodeSetPtr nodes1, xmlNodeSetPtr nodes2) { * @returns a node set comprising the nodes that are within both the * node sets passed as arguments */ -xmlNodeSetPtr -xmlXPathIntersection (xmlNodeSetPtr nodes1, xmlNodeSetPtr nodes2) { +xmlNodeSet * +xmlXPathIntersection (xmlNodeSet *nodes1, xmlNodeSet *nodes2) { xmlNodeSetPtr ret = xmlXPathNodeSetCreate(NULL); int i, l1; xmlNodePtr cur; @@ -3363,8 +3363,8 @@ xmlXPathIntersection (xmlNodeSetPtr nodes1, xmlNodeSetPtr nodes2) { * @returns a subset of the nodes contained in `nodes`, or `nodes` if * it is empty */ -xmlNodeSetPtr -xmlXPathDistinctSorted (xmlNodeSetPtr nodes) { +xmlNodeSet * +xmlXPathDistinctSorted (xmlNodeSet *nodes) { xmlNodeSetPtr ret; xmlHashTablePtr hash; int i, l; @@ -3412,8 +3412,8 @@ error: * @returns a subset of the nodes contained in `nodes`, or `nodes` if * it is empty */ -xmlNodeSetPtr -xmlXPathDistinct (xmlNodeSetPtr nodes) { +xmlNodeSet * +xmlXPathDistinct (xmlNodeSet *nodes) { if (xmlXPathNodeSetIsEmpty(nodes)) return(nodes); @@ -3431,7 +3431,7 @@ xmlXPathDistinct (xmlNodeSetPtr nodes) { * otherwise */ int -xmlXPathHasSameNodes (xmlNodeSetPtr nodes1, xmlNodeSetPtr nodes2) { +xmlXPathHasSameNodes (xmlNodeSet *nodes1, xmlNodeSet *nodes2) { int i, l; xmlNodePtr cur; @@ -3458,8 +3458,8 @@ xmlXPathHasSameNodes (xmlNodeSetPtr nodes1, xmlNodeSetPtr nodes2) { * `nodes` if `node` is NULL or an empty node-set if `nodes` * doesn't contain `node` */ -xmlNodeSetPtr -xmlXPathNodeLeadingSorted (xmlNodeSetPtr nodes, xmlNodePtr node) { +xmlNodeSet * +xmlXPathNodeLeadingSorted (xmlNodeSet *nodes, xmlNode *node) { int i, l; xmlNodePtr cur; xmlNodeSetPtr ret; @@ -3499,8 +3499,8 @@ xmlXPathNodeLeadingSorted (xmlNodeSetPtr nodes, xmlNodePtr node) { * `nodes` if `node` is NULL or an empty node-set if `nodes` * doesn't contain `node` */ -xmlNodeSetPtr -xmlXPathNodeLeading (xmlNodeSetPtr nodes, xmlNodePtr node) { +xmlNodeSet * +xmlXPathNodeLeading (xmlNodeSet *nodes, xmlNode *node) { xmlXPathNodeSetSort(nodes); return(xmlXPathNodeLeadingSorted(nodes, node)); } @@ -3515,8 +3515,8 @@ xmlXPathNodeLeading (xmlNodeSetPtr nodes, xmlNodePtr node) { * in document order, `nodes1` if `nodes2` is NULL or empty or * an empty node-set if `nodes1` doesn't contain `nodes2` */ -xmlNodeSetPtr -xmlXPathLeadingSorted (xmlNodeSetPtr nodes1, xmlNodeSetPtr nodes2) { +xmlNodeSet * +xmlXPathLeadingSorted (xmlNodeSet *nodes1, xmlNodeSet *nodes2) { if (xmlXPathNodeSetIsEmpty(nodes2)) return(nodes1); return(xmlXPathNodeLeadingSorted(nodes1, @@ -3535,8 +3535,8 @@ xmlXPathLeadingSorted (xmlNodeSetPtr nodes1, xmlNodeSetPtr nodes2) { * in document order, `nodes1` if `nodes2` is NULL or empty or * an empty node-set if `nodes1` doesn't contain `nodes2` */ -xmlNodeSetPtr -xmlXPathLeading (xmlNodeSetPtr nodes1, xmlNodeSetPtr nodes2) { +xmlNodeSet * +xmlXPathLeading (xmlNodeSet *nodes1, xmlNodeSet *nodes2) { if (xmlXPathNodeSetIsEmpty(nodes2)) return(nodes1); if (xmlXPathNodeSetIsEmpty(nodes1)) @@ -3557,8 +3557,8 @@ xmlXPathLeading (xmlNodeSetPtr nodes1, xmlNodeSetPtr nodes2) { * `nodes` if `node` is NULL or an empty node-set if `nodes` * doesn't contain `node` */ -xmlNodeSetPtr -xmlXPathNodeTrailingSorted (xmlNodeSetPtr nodes, xmlNodePtr node) { +xmlNodeSet * +xmlXPathNodeTrailingSorted (xmlNodeSet *nodes, xmlNode *node) { int i, l; xmlNodePtr cur; xmlNodeSetPtr ret; @@ -3599,8 +3599,8 @@ xmlXPathNodeTrailingSorted (xmlNodeSetPtr nodes, xmlNodePtr node) { * `nodes` if `node` is NULL or an empty node-set if `nodes` * doesn't contain `node` */ -xmlNodeSetPtr -xmlXPathNodeTrailing (xmlNodeSetPtr nodes, xmlNodePtr node) { +xmlNodeSet * +xmlXPathNodeTrailing (xmlNodeSet *nodes, xmlNode *node) { xmlXPathNodeSetSort(nodes); return(xmlXPathNodeTrailingSorted(nodes, node)); } @@ -3615,8 +3615,8 @@ xmlXPathNodeTrailing (xmlNodeSetPtr nodes, xmlNodePtr node) { * in document order, `nodes1` if `nodes2` is NULL or empty or * an empty node-set if `nodes1` doesn't contain `nodes2` */ -xmlNodeSetPtr -xmlXPathTrailingSorted (xmlNodeSetPtr nodes1, xmlNodeSetPtr nodes2) { +xmlNodeSet * +xmlXPathTrailingSorted (xmlNodeSet *nodes1, xmlNodeSet *nodes2) { if (xmlXPathNodeSetIsEmpty(nodes2)) return(nodes1); return(xmlXPathNodeTrailingSorted(nodes1, @@ -3635,8 +3635,8 @@ xmlXPathTrailingSorted (xmlNodeSetPtr nodes1, xmlNodeSetPtr nodes2) { * in document order, `nodes1` if `nodes2` is NULL or empty or * an empty node-set if `nodes1` doesn't contain `nodes2` */ -xmlNodeSetPtr -xmlXPathTrailing (xmlNodeSetPtr nodes1, xmlNodeSetPtr nodes2) { +xmlNodeSet * +xmlXPathTrailing (xmlNodeSet *nodes1, xmlNodeSet *nodes2) { if (xmlXPathNodeSetIsEmpty(nodes2)) return(nodes1); if (xmlXPathNodeSetIsEmpty(nodes1)) @@ -3662,7 +3662,7 @@ xmlXPathTrailing (xmlNodeSetPtr nodes1, xmlNodeSetPtr nodes2) { * @returns 0 in case of success, -1 in case of error */ int -xmlXPathRegisterFunc(xmlXPathContextPtr ctxt, const xmlChar *name, +xmlXPathRegisterFunc(xmlXPathContext *ctxt, const xmlChar *name, xmlXPathFunction f) { return(xmlXPathRegisterFuncNS(ctxt, name, NULL, f)); } @@ -3677,7 +3677,7 @@ xmlXPathRegisterFunc(xmlXPathContextPtr ctxt, const xmlChar *name, * @returns 0 in case of success, -1 in case of error */ int -xmlXPathRegisterFuncNS(xmlXPathContextPtr ctxt, const xmlChar *name, +xmlXPathRegisterFuncNS(xmlXPathContext *ctxt, const xmlChar *name, const xmlChar *ns_uri, xmlXPathFunction f) { int ret; void *payload; @@ -3713,7 +3713,7 @@ xmlXPathRegisterFuncNS(xmlXPathContextPtr ctxt, const xmlChar *name, * @param funcCtxt the lookup data */ void -xmlXPathRegisterFuncLookup (xmlXPathContextPtr ctxt, +xmlXPathRegisterFuncLookup (xmlXPathContext *ctxt, xmlXPathFuncLookupFunc f, void *funcCtxt) { if (ctxt == NULL) @@ -3731,7 +3731,7 @@ xmlXPathRegisterFuncLookup (xmlXPathContextPtr ctxt, * @returns the xmlXPathFunction or NULL if not found */ xmlXPathFunction -xmlXPathFunctionLookup(xmlXPathContextPtr ctxt, const xmlChar *name) { +xmlXPathFunctionLookup(xmlXPathContext *ctxt, const xmlChar *name) { return(xmlXPathFunctionLookupNS(ctxt, name, NULL)); } @@ -3745,7 +3745,7 @@ xmlXPathFunctionLookup(xmlXPathContextPtr ctxt, const xmlChar *name) { * @returns the xmlXPathFunction or NULL if not found */ xmlXPathFunction -xmlXPathFunctionLookupNS(xmlXPathContextPtr ctxt, const xmlChar *name, +xmlXPathFunctionLookupNS(xmlXPathContext *ctxt, const xmlChar *name, const xmlChar *ns_uri) { xmlXPathFunction ret; void *payload; @@ -3795,7 +3795,7 @@ xmlXPathFunctionLookupNS(xmlXPathContextPtr ctxt, const xmlChar *name, * @param ctxt the XPath context */ void -xmlXPathRegisteredFuncsCleanup(xmlXPathContextPtr ctxt) { +xmlXPathRegisteredFuncsCleanup(xmlXPathContext *ctxt) { if (ctxt == NULL) return; @@ -3819,8 +3819,8 @@ xmlXPathRegisteredFuncsCleanup(xmlXPathContextPtr ctxt) { * @returns 0 in case of success, -1 in case of error */ int -xmlXPathRegisterVariable(xmlXPathContextPtr ctxt, const xmlChar *name, - xmlXPathObjectPtr value) { +xmlXPathRegisterVariable(xmlXPathContext *ctxt, const xmlChar *name, + xmlXPathObject *value) { return(xmlXPathRegisterVariableNS(ctxt, name, NULL, value)); } @@ -3835,9 +3835,9 @@ xmlXPathRegisterVariable(xmlXPathContextPtr ctxt, const xmlChar *name, * @returns 0 in case of success, -1 in case of error */ int -xmlXPathRegisterVariableNS(xmlXPathContextPtr ctxt, const xmlChar *name, +xmlXPathRegisterVariableNS(xmlXPathContext *ctxt, const xmlChar *name, const xmlChar *ns_uri, - xmlXPathObjectPtr value) { + xmlXPathObject *value) { if (ctxt == NULL) return(-1); if (name == NULL) @@ -3862,7 +3862,7 @@ xmlXPathRegisterVariableNS(xmlXPathContextPtr ctxt, const xmlChar *name, * @param data the lookup data */ void -xmlXPathRegisterVariableLookup(xmlXPathContextPtr ctxt, +xmlXPathRegisterVariableLookup(xmlXPathContext *ctxt, xmlXPathVariableLookupFunc f, void *data) { if (ctxt == NULL) return; @@ -3878,8 +3878,8 @@ xmlXPathRegisterVariableLookup(xmlXPathContextPtr ctxt, * @param name the variable name * @returns a copy of the value or NULL if not found */ -xmlXPathObjectPtr -xmlXPathVariableLookup(xmlXPathContextPtr ctxt, const xmlChar *name) { +xmlXPathObject * +xmlXPathVariableLookup(xmlXPathContext *ctxt, const xmlChar *name) { if (ctxt == NULL) return(NULL); @@ -3902,8 +3902,8 @@ xmlXPathVariableLookup(xmlXPathContextPtr ctxt, const xmlChar *name) { * @param ns_uri the variable namespace URI * @returns the a copy of the value or NULL if not found */ -xmlXPathObjectPtr -xmlXPathVariableLookupNS(xmlXPathContextPtr ctxt, const xmlChar *name, +xmlXPathObject * +xmlXPathVariableLookupNS(xmlXPathContext *ctxt, const xmlChar *name, const xmlChar *ns_uri) { if (ctxt == NULL) return(NULL); @@ -3930,7 +3930,7 @@ xmlXPathVariableLookupNS(xmlXPathContextPtr ctxt, const xmlChar *name, * @param ctxt the XPath context */ void -xmlXPathRegisteredVariablesCleanup(xmlXPathContextPtr ctxt) { +xmlXPathRegisteredVariablesCleanup(xmlXPathContext *ctxt) { if (ctxt == NULL) return; @@ -3948,7 +3948,7 @@ xmlXPathRegisteredVariablesCleanup(xmlXPathContextPtr ctxt) { * @returns 0 in case of success, -1 in case of error */ int -xmlXPathRegisterNs(xmlXPathContextPtr ctxt, const xmlChar *prefix, +xmlXPathRegisterNs(xmlXPathContext *ctxt, const xmlChar *prefix, const xmlChar *ns_uri) { xmlChar *copy; @@ -3993,7 +3993,7 @@ xmlXPathRegisterNs(xmlXPathContextPtr ctxt, const xmlChar *prefix, * @returns the value or NULL if not found */ const xmlChar * -xmlXPathNsLookup(xmlXPathContextPtr ctxt, const xmlChar *prefix) { +xmlXPathNsLookup(xmlXPathContext *ctxt, const xmlChar *prefix) { if (ctxt == NULL) return(NULL); if (prefix == NULL) @@ -4021,7 +4021,7 @@ xmlXPathNsLookup(xmlXPathContextPtr ctxt, const xmlChar *prefix) { * @param ctxt the XPath context */ void -xmlXPathRegisteredNsCleanup(xmlXPathContextPtr ctxt) { +xmlXPathRegisteredNsCleanup(xmlXPathContext *ctxt) { if (ctxt == NULL) return; @@ -4043,7 +4043,7 @@ xmlXPathRegisteredNsCleanup(xmlXPathContextPtr ctxt) { * @param val the double value * @returns the newly created object. */ -xmlXPathObjectPtr +xmlXPathObject * xmlXPathNewFloat(double val) { xmlXPathObjectPtr ret; @@ -4062,7 +4062,7 @@ xmlXPathNewFloat(double val) { * @param val the boolean value * @returns the newly created object. */ -xmlXPathObjectPtr +xmlXPathObject * xmlXPathNewBoolean(int val) { xmlXPathObjectPtr ret; @@ -4081,7 +4081,7 @@ xmlXPathNewBoolean(int val) { * @param val the xmlChar * value * @returns the newly created object. */ -xmlXPathObjectPtr +xmlXPathObject * xmlXPathNewString(const xmlChar *val) { xmlXPathObjectPtr ret; @@ -4108,7 +4108,7 @@ xmlXPathNewString(const xmlChar *val) { * @param val the xmlChar * value * @returns the newly created object. */ -xmlXPathObjectPtr +xmlXPathObject * xmlXPathWrapString (xmlChar *val) { xmlXPathObjectPtr ret; @@ -4129,7 +4129,7 @@ xmlXPathWrapString (xmlChar *val) { * @param val the char * value * @returns the newly created object. */ -xmlXPathObjectPtr +xmlXPathObject * xmlXPathNewCString(const char *val) { return(xmlXPathNewString(BAD_CAST val)); } @@ -4140,7 +4140,7 @@ xmlXPathNewCString(const char *val) { * @param val the char * value * @returns the newly created object. */ -xmlXPathObjectPtr +xmlXPathObject * xmlXPathWrapCString (char * val) { return(xmlXPathWrapString((xmlChar *)(val))); } @@ -4151,7 +4151,7 @@ xmlXPathWrapCString (char * val) { * @param val the user data * @returns the newly created object. */ -xmlXPathObjectPtr +xmlXPathObject * xmlXPathWrapExternal (void *val) { xmlXPathObjectPtr ret; @@ -4170,8 +4170,8 @@ xmlXPathWrapExternal (void *val) { * @param val the original object * @returns the newly created object. */ -xmlXPathObjectPtr -xmlXPathObjectCopy(xmlXPathObjectPtr val) { +xmlXPathObject * +xmlXPathObjectCopy(xmlXPathObject *val) { xmlXPathObjectPtr ret; if (val == NULL) @@ -4219,7 +4219,7 @@ xmlXPathObjectCopy(xmlXPathObjectPtr val) { * @param obj the object to free */ void -xmlXPathFreeObject(xmlXPathObjectPtr obj) { +xmlXPathFreeObject(xmlXPathObject *obj) { if (obj == NULL) return; if ((obj->type == XPATH_NODESET) || (obj->type == XPATH_XSLT_TREE)) { if (obj->nodesetval != NULL) @@ -4391,7 +4391,7 @@ xmlXPathCastNumberToString (double val) { * @returns a newly allocated string. */ xmlChar * -xmlXPathCastNodeToString (xmlNodePtr node) { +xmlXPathCastNodeToString (xmlNode *node) { return(xmlNodeGetContent(node)); } @@ -4402,7 +4402,7 @@ xmlXPathCastNodeToString (xmlNodePtr node) { * @returns a newly allocated string. */ xmlChar * -xmlXPathCastNodeSetToString (xmlNodeSetPtr ns) { +xmlXPathCastNodeSetToString (xmlNodeSet *ns) { if ((ns == NULL) || (ns->nodeNr == 0) || (ns->nodeTab == NULL)) return(xmlStrdup((const xmlChar *) "")); @@ -4419,7 +4419,7 @@ xmlXPathCastNodeSetToString (xmlNodeSetPtr ns) { * It's up to the caller to free the string memory with xmlFree(). */ xmlChar * -xmlXPathCastToString(xmlXPathObjectPtr val) { +xmlXPathCastToString(xmlXPathObject *val) { xmlChar *ret = NULL; if (val == NULL) @@ -4456,8 +4456,8 @@ xmlXPathCastToString(xmlXPathObjectPtr val) { * @returns the new object, the old one is freed (or the operation * is done directly on `val`) */ -xmlXPathObjectPtr -xmlXPathConvertString(xmlXPathObjectPtr val) { +xmlXPathObject * +xmlXPathConvertString(xmlXPathObject *val) { xmlChar *res = NULL; if (val == NULL) @@ -4544,7 +4544,7 @@ xmlXPathNodeToNumberInternal(xmlXPathParserContextPtr ctxt, xmlNodePtr node) { * @returns the number value */ double -xmlXPathCastNodeToNumber (xmlNodePtr node) { +xmlXPathCastNodeToNumber (xmlNode *node) { return(xmlXPathNodeToNumberInternal(NULL, node)); } @@ -4555,7 +4555,7 @@ xmlXPathCastNodeToNumber (xmlNodePtr node) { * @returns the number value */ double -xmlXPathCastNodeSetToNumber (xmlNodeSetPtr ns) { +xmlXPathCastNodeSetToNumber (xmlNodeSet *ns) { xmlChar *str; double ret; @@ -4574,7 +4574,7 @@ xmlXPathCastNodeSetToNumber (xmlNodeSetPtr ns) { * @returns the number value */ double -xmlXPathCastToNumber(xmlXPathObjectPtr val) { +xmlXPathCastToNumber(xmlXPathObject *val) { return(xmlXPathCastToNumberInternal(NULL, val)); } @@ -4585,8 +4585,8 @@ xmlXPathCastToNumber(xmlXPathObjectPtr val) { * @returns the new object, the old one is freed (or the operation * is done directly on `val`) */ -xmlXPathObjectPtr -xmlXPathConvertNumber(xmlXPathObjectPtr val) { +xmlXPathObject * +xmlXPathConvertNumber(xmlXPathObject *val) { xmlXPathObjectPtr ret; if (val == NULL) @@ -4631,7 +4631,7 @@ xmlXPathCastStringToBoolean (const xmlChar *val) { * @returns the boolean value */ int -xmlXPathCastNodeSetToBoolean (xmlNodeSetPtr ns) { +xmlXPathCastNodeSetToBoolean (xmlNodeSet *ns) { if ((ns == NULL) || (ns->nodeNr == 0)) return(0); return(1); @@ -4644,7 +4644,7 @@ xmlXPathCastNodeSetToBoolean (xmlNodeSetPtr ns) { * @returns the boolean value */ int -xmlXPathCastToBoolean (xmlXPathObjectPtr val) { +xmlXPathCastToBoolean (xmlXPathObject *val) { int ret = 0; if (val == NULL) @@ -4682,8 +4682,8 @@ xmlXPathCastToBoolean (xmlXPathObjectPtr val) { * @returns the new object, the old one is freed (or the operation * is done directly on `val`) */ -xmlXPathObjectPtr -xmlXPathConvertBoolean(xmlXPathObjectPtr val) { +xmlXPathObject * +xmlXPathConvertBoolean(xmlXPathObject *val) { xmlXPathObjectPtr ret; if (val == NULL) @@ -4707,8 +4707,8 @@ xmlXPathConvertBoolean(xmlXPathObjectPtr val) { * @param doc the XML document * @returns the xmlXPathContext just allocated. The caller will need to free it. */ -xmlXPathContextPtr -xmlXPathNewContext(xmlDocPtr doc) { +xmlXPathContext * +xmlXPathNewContext(xmlDoc *doc) { xmlXPathContextPtr ret; ret = (xmlXPathContextPtr) xmlMalloc(sizeof(xmlXPathContext)); @@ -4750,7 +4750,7 @@ xmlXPathNewContext(xmlDocPtr doc) { * @param ctxt the context to free */ void -xmlXPathFreeContext(xmlXPathContextPtr ctxt) { +xmlXPathFreeContext(xmlXPathContext *ctxt) { if (ctxt == NULL) return; if (ctxt->cache != NULL) @@ -4772,7 +4772,7 @@ xmlXPathFreeContext(xmlXPathContextPtr ctxt) { * @param data user data which will be passed to the handler */ void -xmlXPathSetErrorHandler(xmlXPathContextPtr ctxt, +xmlXPathSetErrorHandler(xmlXPathContext *ctxt, xmlStructuredErrorFunc handler, void *data) { if (ctxt == NULL) return; @@ -4794,8 +4794,8 @@ xmlXPathSetErrorHandler(xmlXPathContextPtr ctxt, * @param ctxt the XPath context * @returns the xmlXPathParserContext just allocated. */ -xmlXPathParserContextPtr -xmlXPathNewParserContext(const xmlChar *str, xmlXPathContextPtr ctxt) { +xmlXPathParserContext * +xmlXPathNewParserContext(const xmlChar *str, xmlXPathContext *ctxt) { xmlXPathParserContextPtr ret; ret = (xmlXPathParserContextPtr) xmlMalloc(sizeof(xmlXPathParserContext)); @@ -4867,7 +4867,7 @@ xmlXPathCompParserContext(xmlXPathCompExprPtr comp, xmlXPathContextPtr ctxt) { * @param ctxt the context to free */ void -xmlXPathFreeParserContext(xmlXPathParserContextPtr ctxt) { +xmlXPathFreeParserContext(xmlXPathParserContext *ctxt) { int i; if (ctxt == NULL) @@ -5690,7 +5690,7 @@ xmlXPathEqualValuesCommon(xmlXPathParserContextPtr ctxt, * @returns 0 or 1 depending on the results of the test. */ int -xmlXPathEqualValues(xmlXPathParserContextPtr ctxt) { +xmlXPathEqualValues(xmlXPathParserContext *ctxt) { xmlXPathObjectPtr arg1, arg2, argtmp; int ret = 0; @@ -5763,7 +5763,7 @@ xmlXPathEqualValues(xmlXPathParserContextPtr ctxt) { * @returns 0 or 1 depending on the results of the test. */ int -xmlXPathNotEqualValues(xmlXPathParserContextPtr ctxt) { +xmlXPathNotEqualValues(xmlXPathParserContext *ctxt) { xmlXPathObjectPtr arg1, arg2, argtmp; int ret = 0; @@ -5852,7 +5852,7 @@ xmlXPathNotEqualValues(xmlXPathParserContextPtr ctxt) { * @returns 1 if the comparison succeeded, 0 if it failed */ int -xmlXPathCompareValues(xmlXPathParserContextPtr ctxt, int inf, int strict) { +xmlXPathCompareValues(xmlXPathParserContext *ctxt, int inf, int strict) { int ret = 0, arg1i = 0, arg2i = 0; xmlXPathObjectPtr arg1, arg2; @@ -5964,7 +5964,7 @@ error: * @param ctxt the XPath Parser context */ void -xmlXPathValueFlipSign(xmlXPathParserContextPtr ctxt) { +xmlXPathValueFlipSign(xmlXPathParserContext *ctxt) { if ((ctxt == NULL) || (ctxt->context == NULL)) return; CAST_TO_NUMBER; CHECK_TYPE(XPATH_NUMBER); @@ -5979,7 +5979,7 @@ xmlXPathValueFlipSign(xmlXPathParserContextPtr ctxt) { * @param ctxt the XPath Parser context */ void -xmlXPathAddValues(xmlXPathParserContextPtr ctxt) { +xmlXPathAddValues(xmlXPathParserContext *ctxt) { xmlXPathObjectPtr arg; double val; @@ -6001,7 +6001,7 @@ xmlXPathAddValues(xmlXPathParserContextPtr ctxt) { * @param ctxt the XPath Parser context */ void -xmlXPathSubValues(xmlXPathParserContextPtr ctxt) { +xmlXPathSubValues(xmlXPathParserContext *ctxt) { xmlXPathObjectPtr arg; double val; @@ -6023,7 +6023,7 @@ xmlXPathSubValues(xmlXPathParserContextPtr ctxt) { * @param ctxt the XPath Parser context */ void -xmlXPathMultValues(xmlXPathParserContextPtr ctxt) { +xmlXPathMultValues(xmlXPathParserContext *ctxt) { xmlXPathObjectPtr arg; double val; @@ -6046,7 +6046,7 @@ xmlXPathMultValues(xmlXPathParserContextPtr ctxt) { */ ATTRIBUTE_NO_SANITIZE("float-divide-by-zero") void -xmlXPathDivValues(xmlXPathParserContextPtr ctxt) { +xmlXPathDivValues(xmlXPathParserContext *ctxt) { xmlXPathObjectPtr arg; double val; @@ -6068,7 +6068,7 @@ xmlXPathDivValues(xmlXPathParserContextPtr ctxt) { * @param ctxt the XPath Parser context */ void -xmlXPathModValues(xmlXPathParserContextPtr ctxt) { +xmlXPathModValues(xmlXPathParserContext *ctxt) { xmlXPathObjectPtr arg; double arg1, arg2; @@ -6098,8 +6098,8 @@ xmlXPathModValues(xmlXPathParserContextPtr ctxt) { * Initially it must be called with NULL, and it indicates * termination on the axis by returning NULL. */ -typedef xmlNodePtr (*xmlXPathTraversalFunction) - (xmlXPathParserContextPtr ctxt, xmlNodePtr cur); +typedef xmlNode *(*xmlXPathTraversalFunction) + (xmlXPathParserContext *ctxt, xmlNode *cur); /* * A traversal function enumerates nodes along an axis. @@ -6107,14 +6107,14 @@ typedef xmlNodePtr (*xmlXPathTraversalFunction) * termination on the axis by returning NULL. * The context node of the traversal is specified via `contextNode`. */ -typedef xmlNodePtr (*xmlXPathTraversalFunctionExt) - (xmlNodePtr cur, xmlNodePtr contextNode); +typedef xmlNode *(*xmlXPathTraversalFunctionExt) + (xmlNode *cur, xmlNode *contextNode); /* * Used for merging node sets in xmlXPathCollectAndTest(). */ -typedef xmlNodeSetPtr (*xmlXPathNodeSetMergeFunction) - (xmlNodeSetPtr, xmlNodeSetPtr); +typedef xmlNodeSet *(*xmlXPathNodeSetMergeFunction) + (xmlNodeSet *, xmlNodeSet *); /** @@ -6125,8 +6125,8 @@ typedef xmlNodeSetPtr (*xmlXPathNodeSetMergeFunction) * @param cur the current node in the traversal * @returns the next element following that axis */ -xmlNodePtr -xmlXPathNextSelf(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { +xmlNode * +xmlXPathNextSelf(xmlXPathParserContext *ctxt, xmlNode *cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); if (cur == NULL) return(ctxt->context->node); @@ -6141,8 +6141,8 @@ xmlXPathNextSelf(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { * @param cur the current node in the traversal * @returns the next element following that axis */ -xmlNodePtr -xmlXPathNextChild(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { +xmlNode * +xmlXPathNextChild(xmlXPathParserContext *ctxt, xmlNode *cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); if (cur == NULL) { if (ctxt->context->node == NULL) return(NULL); @@ -6258,8 +6258,8 @@ xmlXPathNextChildElement(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { * @param cur the current node in the traversal * @returns the next element following that axis */ -xmlNodePtr -xmlXPathNextDescendant(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { +xmlNode * +xmlXPathNextDescendant(xmlXPathParserContext *ctxt, xmlNode *cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); if (cur == NULL) { if (ctxt->context->node == NULL) @@ -6321,8 +6321,8 @@ xmlXPathNextDescendant(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { * @param cur the current node in the traversal * @returns the next element following that axis */ -xmlNodePtr -xmlXPathNextDescendantOrSelf(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { +xmlNode * +xmlXPathNextDescendantOrSelf(xmlXPathParserContext *ctxt, xmlNode *cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); if (cur == NULL) return(ctxt->context->node); @@ -6344,8 +6344,8 @@ xmlXPathNextDescendantOrSelf(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { * @param cur the current node in the traversal * @returns the next element following that axis */ -xmlNodePtr -xmlXPathNextParent(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { +xmlNode * +xmlXPathNextParent(xmlXPathParserContext *ctxt, xmlNode *cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); /* * the parent of an attribute or namespace node is the element @@ -6412,8 +6412,8 @@ xmlXPathNextParent(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { * @param cur the current node in the traversal * @returns the next element following that axis */ -xmlNodePtr -xmlXPathNextAncestor(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { +xmlNode * +xmlXPathNextAncestor(xmlXPathParserContext *ctxt, xmlNode *cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); /* * the parent of an attribute or namespace node is the element @@ -6528,8 +6528,8 @@ xmlXPathNextAncestor(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { * @param cur the current node in the traversal * @returns the next element following that axis */ -xmlNodePtr -xmlXPathNextAncestorOrSelf(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { +xmlNode * +xmlXPathNextAncestorOrSelf(xmlXPathParserContext *ctxt, xmlNode *cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); if (cur == NULL) return(ctxt->context->node); @@ -6545,8 +6545,8 @@ xmlXPathNextAncestorOrSelf(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { * @param cur the current node in the traversal * @returns the next element following that axis */ -xmlNodePtr -xmlXPathNextFollowingSibling(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { +xmlNode * +xmlXPathNextFollowingSibling(xmlXPathParserContext *ctxt, xmlNode *cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); if ((ctxt->context->node->type == XML_ATTRIBUTE_NODE) || (ctxt->context->node->type == XML_NAMESPACE_DECL)) @@ -6568,8 +6568,8 @@ xmlXPathNextFollowingSibling(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { * @param cur the current node in the traversal * @returns the next element following that axis */ -xmlNodePtr -xmlXPathNextPrecedingSibling(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { +xmlNode * +xmlXPathNextPrecedingSibling(xmlXPathParserContext *ctxt, xmlNode *cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); if ((ctxt->context->node->type == XML_ATTRIBUTE_NODE) || (ctxt->context->node->type == XML_NAMESPACE_DECL)) @@ -6597,8 +6597,8 @@ xmlXPathNextPrecedingSibling(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { * @param cur the current node in the traversal * @returns the next element following that axis */ -xmlNodePtr -xmlXPathNextFollowing(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { +xmlNode * +xmlXPathNextFollowing(xmlXPathParserContext *ctxt, xmlNode *cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); if ((cur != NULL) && (cur->type != XML_ATTRIBUTE_NODE) && (cur->type != XML_NAMESPACE_DECL) && (cur->children != NULL)) @@ -6667,8 +6667,8 @@ xmlXPathIsAncestor(xmlNodePtr ancestor, xmlNodePtr node) { * @param cur the current node in the traversal * @returns the next element following that axis */ -xmlNodePtr -xmlXPathNextPreceding(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) +xmlNode * +xmlXPathNextPreceding(xmlXPathParserContext *ctxt, xmlNode *cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); if (cur == NULL) { @@ -6769,8 +6769,8 @@ xmlXPathNextPrecedingInternal(xmlXPathParserContextPtr ctxt, * @param cur the current attribute in the traversal * @returns the next element following that axis */ -xmlNodePtr -xmlXPathNextNamespace(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { +xmlNode * +xmlXPathNextNamespace(xmlXPathParserContext *ctxt, xmlNode *cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); if (ctxt->context->node->type != XML_ELEMENT_NODE) return(NULL); if (cur == NULL) { @@ -6807,8 +6807,8 @@ xmlXPathNextNamespace(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { * @param cur the current attribute in the traversal * @returns the next element following that axis */ -xmlNodePtr -xmlXPathNextAttribute(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { +xmlNode * +xmlXPathNextAttribute(xmlXPathParserContext *ctxt, xmlNode *cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); if (ctxt->context->node == NULL) return(NULL); @@ -6843,7 +6843,7 @@ xmlXPathNextAttribute(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { * @param ctxt the XPath Parser context */ void -xmlXPathRoot(xmlXPathParserContextPtr ctxt) { +xmlXPathRoot(xmlXPathParserContext *ctxt) { if ((ctxt == NULL) || (ctxt->context == NULL)) return; xmlXPathValuePush(ctxt, xmlXPathCacheNewNodeSet(ctxt, @@ -6867,7 +6867,7 @@ xmlXPathRoot(xmlXPathParserContextPtr ctxt) { * @param nargs the number of arguments */ void -xmlXPathLastFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathLastFunction(xmlXPathParserContext *ctxt, int nargs) { CHECK_ARITY(0); if (ctxt->context->contextSize >= 0) { xmlXPathValuePush(ctxt, @@ -6888,7 +6888,7 @@ xmlXPathLastFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathPositionFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathPositionFunction(xmlXPathParserContext *ctxt, int nargs) { CHECK_ARITY(0); if (ctxt->context->proximityPosition >= 0) { xmlXPathValuePush(ctxt, xmlXPathCacheNewFloat(ctxt, @@ -6906,7 +6906,7 @@ xmlXPathPositionFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathCountFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathCountFunction(xmlXPathParserContext *ctxt, int nargs) { xmlXPathObjectPtr cur; CHECK_ARITY(1); @@ -7003,7 +7003,7 @@ xmlXPathGetElementsByIds (xmlDocPtr doc, const xmlChar *ids) { * @param nargs the number of arguments */ void -xmlXPathIdFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathIdFunction(xmlXPathParserContext *ctxt, int nargs) { xmlChar *tokens; xmlNodeSetPtr ret; xmlXPathObjectPtr obj; @@ -7064,7 +7064,7 @@ xmlXPathIdFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathLocalNameFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathLocalNameFunction(xmlXPathParserContext *ctxt, int nargs) { xmlXPathObjectPtr cur; if (ctxt == NULL) return; @@ -7120,7 +7120,7 @@ xmlXPathLocalNameFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathNamespaceURIFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathNamespaceURIFunction(xmlXPathParserContext *ctxt, int nargs) { xmlXPathObjectPtr cur; if (ctxt == NULL) return; @@ -7268,7 +7268,7 @@ xmlXPathNameFunction(xmlXPathParserContextPtr ctxt, int nargs) * @param nargs the number of arguments */ void -xmlXPathStringFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathStringFunction(xmlXPathParserContext *ctxt, int nargs) { xmlXPathObjectPtr cur; xmlChar *stringval; @@ -7306,7 +7306,7 @@ xmlXPathStringFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathStringLengthFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathStringLengthFunction(xmlXPathParserContext *ctxt, int nargs) { xmlXPathObjectPtr cur; if (nargs == 0) { @@ -7344,7 +7344,7 @@ xmlXPathStringLengthFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathConcatFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathConcatFunction(xmlXPathParserContext *ctxt, int nargs) { xmlXPathObjectPtr cur, newobj; xmlChar *tmp; @@ -7390,7 +7390,7 @@ xmlXPathConcatFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathContainsFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathContainsFunction(xmlXPathParserContext *ctxt, int nargs) { xmlXPathObjectPtr hay, needle; CHECK_ARITY(2); @@ -7423,7 +7423,7 @@ xmlXPathContainsFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathStartsWithFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathStartsWithFunction(xmlXPathParserContext *ctxt, int nargs) { xmlXPathObjectPtr hay, needle; int n; @@ -7476,7 +7476,7 @@ xmlXPathStartsWithFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathSubstringFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathSubstringFunction(xmlXPathParserContext *ctxt, int nargs) { xmlXPathObjectPtr str, start, len; double le=0, in; int i = 1, j = INT_MAX; @@ -7563,7 +7563,7 @@ xmlXPathSubstringFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathSubstringBeforeFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathSubstringBeforeFunction(xmlXPathParserContext *ctxt, int nargs) { xmlXPathObjectPtr str = NULL; xmlXPathObjectPtr find = NULL; const xmlChar *point; @@ -7608,7 +7608,7 @@ error: * @param nargs the number of arguments */ void -xmlXPathSubstringAfterFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathSubstringAfterFunction(xmlXPathParserContext *ctxt, int nargs) { xmlXPathObjectPtr str = NULL; xmlXPathObjectPtr find = NULL; const xmlChar *point; @@ -7653,7 +7653,7 @@ error: * @param nargs the number of arguments */ void -xmlXPathNormalizeFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathNormalizeFunction(xmlXPathParserContext *ctxt, int nargs) { xmlChar *source, *target; int blank; @@ -7718,7 +7718,7 @@ xmlXPathNormalizeFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathTranslateFunction(xmlXPathParserContext *ctxt, int nargs) { xmlXPathObjectPtr str = NULL; xmlXPathObjectPtr from = NULL; xmlXPathObjectPtr to = NULL; @@ -7819,7 +7819,7 @@ error: * @param nargs the number of arguments */ void -xmlXPathBooleanFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathBooleanFunction(xmlXPathParserContext *ctxt, int nargs) { xmlXPathObjectPtr cur; CHECK_ARITY(1); @@ -7844,7 +7844,7 @@ xmlXPathBooleanFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathNotFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathNotFunction(xmlXPathParserContext *ctxt, int nargs) { CHECK_ARITY(1); CAST_TO_BOOLEAN; CHECK_TYPE(XPATH_BOOLEAN); @@ -7859,7 +7859,7 @@ xmlXPathNotFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathTrueFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathTrueFunction(xmlXPathParserContext *ctxt, int nargs) { CHECK_ARITY(0); xmlXPathValuePush(ctxt, xmlXPathCacheNewBoolean(ctxt, 1)); } @@ -7872,7 +7872,7 @@ xmlXPathTrueFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathFalseFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathFalseFunction(xmlXPathParserContext *ctxt, int nargs) { CHECK_ARITY(0); xmlXPathValuePush(ctxt, xmlXPathCacheNewBoolean(ctxt, 0)); } @@ -7898,7 +7898,7 @@ xmlXPathFalseFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathLangFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathLangFunction(xmlXPathParserContext *ctxt, int nargs) { xmlXPathObjectPtr val; xmlNodePtr cur; xmlChar *theLang; @@ -7943,7 +7943,7 @@ not_equal: * @param nargs the number of arguments */ void -xmlXPathNumberFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathNumberFunction(xmlXPathParserContext *ctxt, int nargs) { xmlXPathObjectPtr cur; double res; @@ -7985,7 +7985,7 @@ xmlXPathNumberFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathSumFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathSumFunction(xmlXPathParserContext *ctxt, int nargs) { xmlXPathObjectPtr cur; int i; double res = 0.0; @@ -8017,7 +8017,7 @@ xmlXPathSumFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathFloorFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathFloorFunction(xmlXPathParserContext *ctxt, int nargs) { CHECK_ARITY(1); CAST_TO_NUMBER; CHECK_TYPE(XPATH_NUMBER); @@ -8035,7 +8035,7 @@ xmlXPathFloorFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathCeilingFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathCeilingFunction(xmlXPathParserContext *ctxt, int nargs) { CHECK_ARITY(1); CAST_TO_NUMBER; CHECK_TYPE(XPATH_NUMBER); @@ -8059,7 +8059,7 @@ xmlXPathCeilingFunction(xmlXPathParserContextPtr ctxt, int nargs) { * @param nargs the number of arguments */ void -xmlXPathRoundFunction(xmlXPathParserContextPtr ctxt, int nargs) { +xmlXPathRoundFunction(xmlXPathParserContext *ctxt, int nargs) { double f; CHECK_ARITY(1); @@ -8192,7 +8192,7 @@ encoding_error: */ xmlChar * -xmlXPathParseNCName(xmlXPathParserContextPtr ctxt) { +xmlXPathParseNCName(xmlXPathParserContext *ctxt) { const xmlChar *in; xmlChar *ret; int count = 0; @@ -8271,7 +8271,7 @@ xmlXPathParseQName(xmlXPathParserContextPtr ctxt, xmlChar **prefix) { */ xmlChar * -xmlXPathParseName(xmlXPathParserContextPtr ctxt) { +xmlXPathParseName(xmlXPathParserContext *ctxt) { const xmlChar *in; xmlChar *ret; size_t count = 0; @@ -11758,7 +11758,7 @@ xmlXPathRunEval(xmlXPathParserContextPtr ctxt, int toBool) * @returns 1 if predicate is true, 0 otherwise */ int -xmlXPathEvalPredicate(xmlXPathContextPtr ctxt, xmlXPathObjectPtr res) { +xmlXPathEvalPredicate(xmlXPathContext *ctxt, xmlXPathObject *res) { if ((ctxt == NULL) || (res == NULL)) return(0); switch (res->type) { case XPATH_BOOLEAN: @@ -11794,8 +11794,8 @@ xmlXPathEvalPredicate(xmlXPathContextPtr ctxt, xmlXPathObjectPtr res) { * @returns 1 if predicate is true, 0 otherwise */ int -xmlXPathEvaluatePredicateResult(xmlXPathParserContextPtr ctxt, - xmlXPathObjectPtr res) { +xmlXPathEvaluatePredicateResult(xmlXPathParserContext *ctxt, + xmlXPathObject *res) { if ((ctxt == NULL) || (res == NULL)) return(0); switch (res->type) { case XPATH_BOOLEAN: @@ -11990,8 +11990,8 @@ xmlXPathOptimizeExpression(xmlXPathParserContextPtr pctxt, * @returns the xmlXPathCompExprPtr resulting from the compilation or NULL. * the caller has to free the object. */ -xmlXPathCompExprPtr -xmlXPathCtxtCompile(xmlXPathContextPtr ctxt, const xmlChar *str) { +xmlXPathCompExpr * +xmlXPathCtxtCompile(xmlXPathContext *ctxt, const xmlChar *str) { xmlXPathParserContextPtr pctxt; xmlXPathContextPtr tmpctxt = NULL; xmlXPathCompExprPtr comp; @@ -12074,7 +12074,7 @@ xmlXPathCtxtCompile(xmlXPathContextPtr ctxt, const xmlChar *str) { * @returns the xmlXPathCompExprPtr resulting from the compilation or NULL. * the caller has to free the object. */ -xmlXPathCompExprPtr +xmlXPathCompExpr * xmlXPathCompile(const xmlChar *str) { return(xmlXPathCtxtCompile(NULL, str)); } @@ -12137,8 +12137,8 @@ xmlXPathCompiledEvalInternal(xmlXPathCompExprPtr comp, * @returns the xmlXPathObjectPtr resulting from the evaluation or NULL. * the caller has to free the object. */ -xmlXPathObjectPtr -xmlXPathCompiledEval(xmlXPathCompExprPtr comp, xmlXPathContextPtr ctx) +xmlXPathObject * +xmlXPathCompiledEval(xmlXPathCompExpr *comp, xmlXPathContext *ctx) { xmlXPathObjectPtr res = NULL; @@ -12156,8 +12156,8 @@ xmlXPathCompiledEval(xmlXPathCompExprPtr comp, xmlXPathContextPtr ctx) * -1 in API and internal errors. */ int -xmlXPathCompiledEvalToBoolean(xmlXPathCompExprPtr comp, - xmlXPathContextPtr ctxt) +xmlXPathCompiledEvalToBoolean(xmlXPathCompExpr *comp, + xmlXPathContext *ctxt) { return(xmlXPathCompiledEvalInternal(comp, ctxt, NULL, 1)); } @@ -12171,7 +12171,7 @@ xmlXPathCompiledEvalToBoolean(xmlXPathCompExprPtr comp, * @param ctxt the XPath Parser context */ void -xmlXPathEvalExpr(xmlXPathParserContextPtr ctxt) { +xmlXPathEvalExpr(xmlXPathParserContext *ctxt) { #ifdef XPATH_STREAMING xmlXPathCompExprPtr comp; #endif @@ -12228,8 +12228,8 @@ xmlXPathEvalExpr(xmlXPathParserContextPtr ctxt) { * @returns the xmlXPathObjectPtr resulting from the evaluation or NULL. * the caller has to free the object. */ -xmlXPathObjectPtr -xmlXPathEval(const xmlChar *str, xmlXPathContextPtr ctx) { +xmlXPathObject * +xmlXPathEval(const xmlChar *str, xmlXPathContext *ctx) { xmlXPathParserContextPtr ctxt; xmlXPathObjectPtr res; @@ -12267,7 +12267,7 @@ xmlXPathEval(const xmlChar *str, xmlXPathContextPtr ctx) { * @returns -1 in case of error or 0 if successful */ int -xmlXPathSetContextNode(xmlNodePtr node, xmlXPathContextPtr ctx) { +xmlXPathSetContextNode(xmlNode *node, xmlXPathContext *ctx) { if ((node == NULL) || (ctx == NULL)) return(-1); @@ -12288,8 +12288,8 @@ xmlXPathSetContextNode(xmlNodePtr node, xmlXPathContextPtr ctx) { * @returns the xmlXPathObjectPtr resulting from the evaluation or NULL. * the caller has to free the object. */ -xmlXPathObjectPtr -xmlXPathNodeEval(xmlNodePtr node, const xmlChar *str, xmlXPathContextPtr ctx) { +xmlXPathObject * +xmlXPathNodeEval(xmlNode *node, const xmlChar *str, xmlXPathContext *ctx) { if (str == NULL) return(NULL); if (xmlXPathSetContextNode(node, ctx) < 0) @@ -12305,8 +12305,8 @@ xmlXPathNodeEval(xmlNodePtr node, const xmlChar *str, xmlXPathContextPtr ctx) { * @returns the xmlXPathObjectPtr resulting from the evaluation or NULL. * the caller has to free the object. */ -xmlXPathObjectPtr -xmlXPathEvalExpression(const xmlChar *str, xmlXPathContextPtr ctxt) { +xmlXPathObject * +xmlXPathEvalExpression(const xmlChar *str, xmlXPathContext *ctxt) { return(xmlXPathEval(str, ctxt)); } @@ -12318,7 +12318,7 @@ xmlXPathEvalExpression(const xmlChar *str, xmlXPathContextPtr ctxt) { * @param ctxt the XPath context */ void -xmlXPathRegisterAllFunctions(xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED) +xmlXPathRegisterAllFunctions(xmlXPathContext *ctxt ATTRIBUTE_UNUSED) { } diff --git a/xpointer.c b/xpointer.c index 6cfb0853..bc0e1a3e 100644 --- a/xpointer.c +++ b/xpointer.c @@ -571,8 +571,8 @@ xmlXPtrEvalXPointer(xmlXPathParserContextPtr ctxt) { * the link, or NULL. * @returns the xmlXPathContext just allocated. */ -xmlXPathContextPtr -xmlXPtrNewContext(xmlDocPtr doc, xmlNodePtr here, xmlNodePtr origin) { +xmlXPathContext * +xmlXPtrNewContext(xmlDoc *doc, xmlNode *here, xmlNode *origin) { xmlXPathContextPtr ret; (void) here; (void) origin; @@ -592,8 +592,8 @@ xmlXPtrNewContext(xmlDocPtr doc, xmlNodePtr here, xmlNodePtr origin) { * @returns the xmlXPathObjectPtr resulting from the evaluation or NULL. * the caller has to free the object. */ -xmlXPathObjectPtr -xmlXPtrEval(const xmlChar *str, xmlXPathContextPtr ctx) { +xmlXPathObject * +xmlXPtrEval(const xmlChar *str, xmlXPathContext *ctx) { xmlXPathParserContextPtr ctxt; xmlXPathObjectPtr res = NULL, tmp; xmlXPathObjectPtr init = NULL;