From 71b656e06707c733ab02c5bf9bd2754cea678562 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Wed, 5 Jan 2000 14:46:17 +0000 Subject: [PATCH] - added xmlRemoveID() and xmlRemoveRef() - added check and handling when possibly removing an ID - fixed some entities problems - added xmlParseTryOrFinish() - changed the way struct aredeclared to allow gtk-doc to expose those - closed #4960 - fixes to libs detection from Albert Chin-A-Young - preparing 1.8.3 release Daniel --- ChangeLog | 21 + HTMLparser.c | 148 +- HTMLparser.h | 12 +- Makefile.am | 2 +- acconfig.h | 2 + config.h.in | 17 +- configure.in | 65 +- debugXML.h | 6 +- doc/html/book1.html | 9 +- doc/html/gnome-xml-entities.html | 206 +- doc/html/gnome-xml-htmlparser.html | 896 +------ doc/html/gnome-xml-htmltree.html | 54 +- doc/html/gnome-xml-nanohttp.html | 80 +- doc/html/gnome-xml-parser.html | 1433 ++++------- doc/html/gnome-xml-parserinternals.html | 524 ++-- doc/html/gnome-xml-tree.html | 2982 ++++------------------- doc/html/gnome-xml-valid.html | 498 ++-- doc/html/gnome-xml-xml-error.html | 62 +- doc/html/gnome-xml-xmlmemory.html | 182 +- doc/html/gnome-xml-xpath.html | 331 +-- doc/html/index.sgml | 60 +- encoding.h | 7 +- entities.h | 14 +- include/libxml/HTMLparser.h | 12 +- include/libxml/debugXML.h | 6 +- include/libxml/encoding.h | 7 +- include/libxml/entities.h | 14 +- include/libxml/parser.h | 54 +- include/libxml/tree.h | 140 +- include/libxml/valid.h | 43 +- include/libxml/xlink.h | 7 +- include/libxml/xmlIO.h | 7 +- include/libxml/xpath.h | 49 +- parser.c | 81 +- parser.h | 54 +- result/HTML/fp40.htm | 2 +- result/HTML/wired.html | 32 +- tree.c | 6 +- tree.h | 140 +- valid.c | 88 +- valid.h | 43 +- xlink.h | 7 +- xmlIO.h | 7 +- xpath.h | 49 +- 44 files changed, 2414 insertions(+), 6045 deletions(-) diff --git a/ChangeLog b/ChangeLog index 095b1148..989ad74a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +Wed Jan 5 17:08:43 CET 2000 Daniel Veillard + + * acconfig.h: readline and history patch + * valid.[ch]: added xmlRemoveID() and xmlRemoveRef() + * tree.c: added check and handling when possibly removing an ID + * tree.c, HTMLparser.h, HTMLtree.h: fixed entities parsing + and saving. + * test/HTML/entities.html result/HTML/entities.html* : test for + various entities reference cases + * result/HTML/* : as a result output of some testcase have + changed + * HTMLparser.c, parser.c: fixed a bug in the push mode triggered + by previous example. added xmlParseTryOrFinish(). + * xpath.h tree.h parser.h valid.h xmlIO.h xlink.h encoding.h + entities.h debugXML.h HTMLparser.h: changed the way struct are + declared to allow gtk-doc to expose those + * parser.c: closed bug #4960 + * Makefile.am configure.in: Applied patch from + Albert Chin-A-Young for better zlib + and math/socket libs detection + Mon Jan 3 18:29:43 CET 2000 Daniel Veillard * configure.in, Makefile.am: link tester against readline diff --git a/HTMLparser.c b/HTMLparser.c index d09b8c57..a5b16575 100644 --- a/HTMLparser.c +++ b/HTMLparser.c @@ -1391,6 +1391,7 @@ htmlParseName(htmlParserCtxtPtr ctxt) { xmlChar * htmlParseHTMLAttribute(htmlParserCtxtPtr ctxt, const xmlChar stop) { +#if 0 xmlChar buf[HTML_MAX_NAMELEN]; int len = 0; @@ -1410,6 +1411,84 @@ htmlParseHTMLAttribute(htmlParserCtxtPtr ctxt, const xmlChar stop) { } } return(xmlStrndup(buf, len)); +#else + xmlChar *buffer = NULL; + int buffer_size = 0; + xmlChar *out = NULL; + xmlChar *name = NULL; + + xmlChar *cur = NULL; + htmlEntityDescPtr ent; + + /* + * allocate a translation buffer. + */ + buffer_size = HTML_PARSER_BIG_BUFFER_SIZE; + buffer = (xmlChar *) xmlMalloc(buffer_size * sizeof(xmlChar)); + if (buffer == NULL) { + perror("htmlParseHTMLAttribute: malloc failed"); + return(NULL); + } + out = buffer; + + /* + * Ok loop until we reach one of the ending chars + */ + while ((CUR != 0) && (CUR != stop) && (CUR != '>')) { + if ((stop == 0) && (IS_BLANK(CUR))) break; + if (CUR == '&') { + if (NXT(1) == '#') { + int val = htmlParseCharRef(ctxt); + *out++ = val; + } else { + ent = htmlParseEntityRef(ctxt, &name); + if (name == NULL) { + *out++ = '&'; + if (out - buffer > buffer_size - 100) { + int index = out - buffer; + + growBuffer(buffer); + out = &buffer[index]; + } + } else if ((ent == NULL) || (ent->value <= 0) || + (ent->value >= 255)) { + *out++ = '&'; + cur = name; + while (*cur != 0) { + if (out - buffer > buffer_size - 100) { + int index = out - buffer; + + growBuffer(buffer); + out = &buffer[index]; + } + *out++ = *cur++; + } + xmlFree(name); + } else { + *out++ = ent->value; + if (out - buffer > buffer_size - 100) { + int index = out - buffer; + + growBuffer(buffer); + out = &buffer[index]; + } + xmlFree(name); + } + } + } else { + *out++ = CUR; + if (out - buffer > buffer_size - 100) { + int index = out - buffer; + + growBuffer(buffer); + out = &buffer[index]; + } + NEXT; + } + } + *out++ = 0; + return(buffer); +#endif } /** @@ -1477,23 +1556,19 @@ htmlParseEntityRef(htmlParserCtxtPtr ctxt, xmlChar **str) { } else { GROW; if (CUR == ';') { - NEXT; *str = name; /* * Lookup the entity in the table. */ ent = htmlEntityLookup(name); + if (ent != NULL) /* OK that's ugly !!! */ + NEXT; } else { if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) ctxt->sax->error(ctxt->userData, "htmlParseEntityRef: expecting ';'\n"); - ctxt->wellFormed = 0; - if (ctxt->sax->characters != NULL) { - ctxt->sax->characters(ctxt->userData, BAD_CAST "&", 1); - ctxt->sax->characters(ctxt->userData, name, xmlStrlen(name)); - } - xmlFree(name); + *str = name; } } } @@ -2321,12 +2396,15 @@ htmlParseReference(htmlParserCtxtPtr ctxt) { ctxt->sax->characters(ctxt->userData, out, 1); } else { ent = htmlParseEntityRef(ctxt, &name); - if (name == NULL) return; /* Shall we output & anyway ? */ + if (name == NULL) { + ctxt->sax->characters(ctxt->userData, BAD_CAST "&", 1); + return; + } if ((ent == NULL) || (ent->value <= 0) || (ent->value >= 255)) { if ((ctxt->sax != NULL) && (ctxt->sax->characters != NULL)) { ctxt->sax->characters(ctxt->userData, BAD_CAST "&", 1); ctxt->sax->characters(ctxt->userData, name, xmlStrlen(name)); - ctxt->sax->characters(ctxt->userData, BAD_CAST ";", 1); + /* ctxt->sax->characters(ctxt->userData, BAD_CAST ";", 1); */ } } else { /* invalid for UTF-8 variable encoding !!!!! */ @@ -2903,15 +2981,16 @@ htmlParseLookupSequence(htmlParserCtxtPtr ctxt, xmlChar first, } /** - * htmlParseTry: + * htmlParseTryOrFinish: * @ctxt: an HTML parser context + * @terminate: last chunk indicator * * Try to progress on parsing * * Returns zero if no parsing was possible */ int -htmlParseTry(htmlParserCtxtPtr ctxt) { +htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) { int ret = 0; htmlParserInputPtr in; int avail; @@ -2990,7 +3069,8 @@ htmlParseTry(htmlParserCtxtPtr ctxt) { (UPP(4) == 'C') && (UPP(5) == 'T') && (UPP(6) == 'Y') && (UPP(7) == 'P') && (UPP(8) == 'E')) { - if (htmlParseLookupSequence(ctxt, '>', 0, 0) < 0) + if ((!terminate) && + (htmlParseLookupSequence(ctxt, '>', 0, 0) < 0)) goto done; #ifdef DEBUG_PUSH fprintf(stderr, "HPP: Parsing internal subset\n"); @@ -3020,7 +3100,8 @@ htmlParseTry(htmlParserCtxtPtr ctxt) { next = in->cur[1]; if ((cur == '<') && (next == '!') && (in->cur[2] == '-') && (in->cur[3] == '-')) { - if (htmlParseLookupSequence(ctxt, '-', '-', '>') < 0) + if ((!terminate) && + (htmlParseLookupSequence(ctxt, '-', '-', '>') < 0)) goto done; #ifdef DEBUG_PUSH fprintf(stderr, "HPP: Parsing Comment\n"); @@ -3032,7 +3113,8 @@ htmlParseTry(htmlParserCtxtPtr ctxt) { (UPP(4) == 'C') && (UPP(5) == 'T') && (UPP(6) == 'Y') && (UPP(7) == 'P') && (UPP(8) == 'E')) { - if (htmlParseLookupSequence(ctxt, '>', 0, 0) < 0) + if ((!terminate) && + (htmlParseLookupSequence(ctxt, '>', 0, 0) < 0)) goto done; #ifdef DEBUG_PUSH fprintf(stderr, "HPP: Parsing internal subset\n"); @@ -3064,7 +3146,8 @@ htmlParseTry(htmlParserCtxtPtr ctxt) { next = in->cur[1]; if ((cur == '<') && (next == '!') && (in->cur[2] == '-') && (in->cur[3] == '-')) { - if (htmlParseLookupSequence(ctxt, '-', '-', '>') < 0) + if ((!terminate) && + (htmlParseLookupSequence(ctxt, '-', '-', '>') < 0)) goto done; #ifdef DEBUG_PUSH fprintf(stderr, "HPP: Parsing Comment\n"); @@ -3093,7 +3176,8 @@ htmlParseTry(htmlParserCtxtPtr ctxt) { next = in->cur[1]; if ((cur == '<') && (next == '!') && (in->cur[2] == '-') && (in->cur[3] == '-')) { - if (htmlParseLookupSequence(ctxt, '-', '-', '>') < 0) + if ((!terminate) && + (htmlParseLookupSequence(ctxt, '-', '-', '>') < 0)) goto done; #ifdef DEBUG_PUSH fprintf(stderr, "HPP: Parsing Comment\n"); @@ -3133,7 +3217,8 @@ htmlParseTry(htmlParserCtxtPtr ctxt) { #endif break; } - if (htmlParseLookupSequence(ctxt, '>', 0, 0) < 0) + if ((!terminate) && + (htmlParseLookupSequence(ctxt, '>', 0, 0) < 0)) goto done; oldname = xmlStrdup(ctxt->name); @@ -3268,7 +3353,8 @@ htmlParseTry(htmlParserCtxtPtr ctxt) { next = in->cur[1]; if ((cur == '<') && (next == '!') && (in->cur[2] == '-') && (in->cur[3] == '-')) { - if (htmlParseLookupSequence(ctxt, '-', '-', '>') < 0) + if ((!terminate) && + (htmlParseLookupSequence(ctxt, '-', '-', '>') < 0)) goto done; #ifdef DEBUG_PUSH fprintf(stderr, "HPP: Parsing Comment\n"); @@ -3292,7 +3378,8 @@ htmlParseTry(htmlParserCtxtPtr ctxt) { #endif break; } else if (cur == '&') { - if (htmlParseLookupSequence(ctxt, ';', 0, 0) < 0) + if ((!terminate) && + (htmlParseLookupSequence(ctxt, ';', 0, 0) < 0)) goto done; #ifdef DEBUG_PUSH fprintf(stderr, "HPP: Parsing Reference\n"); @@ -3308,7 +3395,8 @@ htmlParseTry(htmlParserCtxtPtr ctxt) { */ if ((ctxt->inputNr == 1) && (avail < HTML_PARSER_BIG_BUFFER_SIZE)) { - if (htmlParseLookupSequence(ctxt, '<', 0, 0) < 0) + if ((!terminate) && + (htmlParseLookupSequence(ctxt, '<', 0, 0) < 0)) goto done; } ctxt->checkIndex = 0; @@ -3321,7 +3409,8 @@ htmlParseTry(htmlParserCtxtPtr ctxt) { case XML_PARSER_END_TAG: if (avail < 2) goto done; - if (htmlParseLookupSequence(ctxt, '>', 0, 0) < 0) + if ((!terminate) && + (htmlParseLookupSequence(ctxt, '>', 0, 0) < 0)) goto done; htmlParseEndTag(ctxt); if (ctxt->nameNr == 0) { @@ -3399,6 +3488,19 @@ done: return(ret); } +/** + * htmlParseTry: + * @ctxt: an HTML parser context + * + * Try to progress on parsing + * + * Returns zero if no parsing was possible + */ +int +htmlParseTry(htmlParserCtxtPtr ctxt) { + return(htmlParseTryOrFinish(ctxt, 0)); +} + /** * htmlParseChunk: * @ctxt: an XML parser context @@ -3425,9 +3527,9 @@ htmlParseChunk(htmlParserCtxtPtr ctxt, const char *chunk, int size, fprintf(stderr, "HPP: pushed %d\n", size); #endif - htmlParseTry(ctxt); + htmlParseTryOrFinish(ctxt, terminate); } else if (ctxt->instate != XML_PARSER_EOF) - htmlParseTry(ctxt); + htmlParseTryOrFinish(ctxt, terminate); if (terminate) { if ((ctxt->instate != XML_PARSER_EOF) && (ctxt->instate != XML_PARSER_EPILOG) && diff --git a/HTMLparser.h b/HTMLparser.h index ecb91cb2..22fe6147 100644 --- a/HTMLparser.h +++ b/HTMLparser.h @@ -30,7 +30,9 @@ typedef xmlNodePtr htmlNodePtr; /* * Internal description of an HTML element */ -typedef struct htmlElemDesc { +typedef struct _htmlElemDesc htmlElemDesc; +typedef htmlElemDesc *htmlElemDescPtr; +struct _htmlElemDesc { const char *name; /* The tag name */ int startTag; /* Whether the start tag can be implied */ int endTag; /* Whether the end tag can be implied */ @@ -38,16 +40,18 @@ typedef struct htmlElemDesc { int depr; /* Is this a deprecated element ? */ int dtd; /* 1: only in Loose DTD, 2: only Frameset one */ const char *desc; /* the description */ -} htmlElemDesc, *htmlElemDescPtr; +}; /* * Internal description of an HTML entity */ -typedef struct htmlEntityDesc { +typedef struct _htmlEntityDesc htmlEntityDesc; +typedef htmlEntityDesc *htmlEntityDescPtr; +struct _htmlEntityDesc { int value; /* the UNICODE value for the character */ const char *name; /* The entity name */ const char *desc; /* the description */ -} htmlEntityDesc, *htmlEntityDescPtr; +}; /* * There is only few public functions. diff --git a/Makefile.am b/Makefile.am index c6404e2a..14ae2584 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = doc -INCLUDES = -I@srcdir@ @CORBA_CFLAGS@ $(VERSION_FLAGS) +INCLUDES = -I@srcdir@ @Z_CFLAGS@ @CORBA_CFLAGS@ $(VERSION_FLAGS) VERSION_FLAGS = -DLIBXML_VERSION=\"@LIBXML_VERSION@\" diff --git a/acconfig.h b/acconfig.h index 6d79490b..49f419f8 100644 --- a/acconfig.h +++ b/acconfig.h @@ -4,3 +4,5 @@ #undef HAVE_LIBM #undef HAVE_ISINF #undef HAVE_ISNAN +#undef HAVE_LIBHISTORY +#undef HAVE_LIBREADLINE diff --git a/config.h.in b/config.h.in index 842670ba..b3b74ec8 100644 --- a/config.h.in +++ b/config.h.in @@ -12,6 +12,8 @@ #undef HAVE_LIBM #undef HAVE_ISINF #undef HAVE_ISNAN +#undef HAVE_LIBHISTORY +#undef HAVE_LIBREADLINE /* Define if you have the class function. */ #undef HAVE_CLASS @@ -25,12 +27,6 @@ /* Define if you have the fpclass function. */ #undef HAVE_FPCLASS -/* Define if you have the isinf function. */ -#undef HAVE_ISINF - -/* Define if you have the isnan function. */ -#undef HAVE_ISNAN - /* Define if you have the isnand function. */ #undef HAVE_ISNAND @@ -127,21 +123,12 @@ /* Define if you have the header file. */ #undef HAVE_UNISTD_H -/* Define if you have the header file. */ -#undef HAVE_ZLIB_H - -/* Define if you have the history library (-lhistory). */ -#undef HAVE_LIBHISTORY - /* Define if you have the inet library (-linet). */ #undef HAVE_LIBINET /* Define if you have the nsl library (-lnsl). */ #undef HAVE_LIBNSL -/* Define if you have the readline library (-lreadline). */ -#undef HAVE_LIBREADLINE - /* Define if you have the socket library (-lsocket). */ #undef HAVE_LIBSOCKET diff --git a/configure.in b/configure.in index 51d84185..79dfd5dd 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AM_CONFIG_HEADER(config.h) LIBXML_MAJOR_VERSION=1 LIBXML_MINOR_VERSION=8 -LIBXML_MICRO_VERSION=2 +LIBXML_MICRO_VERSION=3 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION @@ -33,18 +33,39 @@ AM_PROG_LIBTOOL AM_MAINTAINER_MODE -dnl Checks for libraries. -Z_LIBS= -AC_CHECK_LIB(z, inflate, - AC_CHECK_HEADER(zlib.h, - Z_LIBS="-lz"; AC_DEFINE(HAVE_LIBZ))) +dnl Checks for zlib library. +_cppflags="${CPPFLAGS}" +_ldflags="${LDFLAGS}" +AC_ARG_WITH(zlib, +[ --with-zlib[=DIR] use libz in DIR],[ + if test "$withval" != "no"; then + Z_DIR=$withval + CPPFLAGS="${CPPFLAGS} -I$withval/include" + LDFLAGS="${LDFLAGS} -L$withval/lib" + fi +]) + +AC_CHECK_HEADER(zlib.h, + AC_CHECK_LIB(z, gzread,[ + AC_DEFINE(HAVE_LIBZ) + if test "x${Z_DIR}" != "x"; then + Z_CFLAGS="-I${Z_DIR}/include" + Z_LIBS="-L${Z_DIR}/lib -lz" + else + Z_LIBS="-lz" + fi])) +AC_SUBST(Z_CFLAGS) +AC_SUBST(Z_LIBS) + +CPPFLAGS=${_cppflags} +LDFLAGS=${_ldflags} dnl Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC AC_CHECK_HEADERS(fcntl.h unistd.h ctype.h dirent.h errno.h malloc.h) -AC_CHECK_HEADERS(stdarg.h sys/stat.h sys/types.h time.h zlib.h) +AC_CHECK_HEADERS(stdarg.h sys/stat.h sys/types.h time.h) AC_CHECK_HEADERS(ieeefp.h nan.h math.h fp_class.h float.h) AC_CHECK_HEADERS(stdlib.h sys/socket.h netinet/in.h arpa/inet.h) AC_CHECK_HEADERS(netdb.h sys/time.h sys/select.h) @@ -71,33 +92,20 @@ AC_SUBST(CORBA_CFLAGS) dnl Checks for library functions. AC_FUNC_STRFTIME AC_CHECK_FUNCS(strdup strndup strerror snprintf) -AC_CHECK_FUNCS(finite isinf isnan isnand fp_class class fpclass finite) +AC_CHECK_FUNCS(finite isnand fp_class class fpclass) AC_CHECK_FUNCS(strftime localtime) dnl Checks for inet libraries: -AC_CHECK_LIB(socket, socket) -AC_CHECK_LIB(inet, connect) -AC_CHECK_LIB(nsl, t_accept) +AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent)) +AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) +AC_CHECK_FUNC(connect, , AC_CHECK_LIB(inet, connect)) dnl Checks for isnan in libm if not in libc -M_LIBS= -if test "$ac_cv_func_isnan" != "yes" -then -AC_CHECK_LIB(m, isnan, - M_LIBS="-lm"; AC_DEFINE(HAVE_ISNAN)) -fi +AC_CHECK_FUNC(isnan, , AC_CHECK_LIB(m, isnan, + [M_LIBS="-lm"; AC_DEFINE(HAVE_ISNAN)])) -dnl Checks for isinf in libm if not in libc -if test "$ac_cv_func_isinf" != "yes" -then -M2_LIBS="" -AC_CHECK_LIB(m, isinf, - M2_LIBS="-lm"; AC_DEFINE(HAVE_ISINF)) -if test "$M2_LIBS" != "" -then - M_LIBS="$M2_LIBS" -fi -fi +AC_CHECK_FUNC(isinf, , AC_CHECK_LIB(m, isinf, + [M_LIBS="-lm"; AC_DEFINE(HAVE_ISINF)])) XML_LIBDIR='-L${libdir}' XML_INCLUDEDIR='-I${includedir}/gnome-xml' @@ -149,7 +157,6 @@ AC_SUBST(HTML_DIR) AC_SUBST(HAVE_ISNAN) AC_SUBST(HAVE_ISINF) -AC_SUBST(Z_LIBS) AC_SUBST(M_LIBS) AC_SUBST(RDL_LIBS) AC_OUTPUT(libxml.spec Makefile doc/Makefile example/Makefile xml-config win32config.h) diff --git a/debugXML.h b/debugXML.h index 8774f0bd..5d4d2ae1 100644 --- a/debugXML.h +++ b/debugXML.h @@ -64,7 +64,9 @@ typedef char * (* xmlShellReadlineFunc)(char *prompt); * The shell context itself * TODO: add the defined function tables. */ -typedef struct xmlShellCtxt { +typedef struct _xmlShellCtxt xmlShellCtxt; +typedef xmlShellCtxt *xmlShellCtxtPtr; +struct _xmlShellCtxt { char *filename; xmlDocPtr doc; xmlNodePtr node; @@ -72,7 +74,7 @@ typedef struct xmlShellCtxt { int loaded; FILE *output; xmlShellReadlineFunc input; -} xmlShellCtxt, *xmlShellCtxtPtr; +}; /** * xmlShellCmd: diff --git a/doc/html/book1.html b/doc/html/book1.html index 1e53fbc0..13265f03 100644 --- a/doc/html/book1.html +++ b/doc/html/book1.html @@ -4,13 +4,16 @@ >Gnome XML Library Reference Manual

    Daniel.Veillard@w3.org
  

Copyright © 1999 by Copyright © 1999 by Daniel Veillard

entities

entities

entities

Name

entities —
entities -- 

Synopsis

xmlEntitiesTablePtr table); -void xmlCleanupPredefinedEntities (void); table);

Description

Details

#define XML_INTERNAL_GENERAL_ENTITY		1
#define XML_INTERNAL_GENERAL_ENTITY

#define XML_EXTERNAL_GENERAL_PARSED_ENTITY	2
#define XML_EXTERNAL_GENERAL_PARSED_ENTITY

#define XML_EXTERNAL_GENERAL_UNPARSED_ENTITY	3
#define XML_EXTERNAL_GENERAL_UNPARSED_ENTITY

#define XML_INTERNAL_PARAMETER_ENTITY		4
#define XML_INTERNAL_PARAMETER_ENTITY

#define XML_EXTERNAL_PARAMETER_ENTITY		5
#define XML_EXTERNAL_PARAMETER_ENTITY

#define XML_INTERNAL_PREDEFINED_ENTITY		6
#define XML_INTERNAL_PREDEFINED_ENTITY

xmlEntityPtr

typedef xmlEntity *xmlEntityPtr;

#define XML_MIN_ENTITIES_TABLE	32
#define XML_MIN_ENTITIES_TABLE

xmlEntitiesTablePtr

typedef xmlEntitiesTable *xmlEntitiesTablePtr;

the document  the entity name  the entity type XML_xxx_yyy_ENTITY  the entity external ID if available  the entity system ID if available  the entity content 

the document  the entity name  the entity type XML_xxx_yyy_ENTITY  the entity external ID if available  the entity system ID if available  the entity content 

the entity name NULL if not, othervise the entity 

the document referencing the entity  the entity name A pointer to the entity structure or NULL if not found. 

the document referencing the entity  the entity name A pointer to the entity structure or NULL if not found. 

the document referencing the entity  the entity name A pointer to the entity structure or NULL if not found. 

the document containing the string  A string to convert to XML. A newly allocated string with the substitution done. 

the document containing the string  A string to convert to XML. A newly allocated string with the substitution done. 

the xmlEntitiesTablePtr just created or NULL in case of error. 

An entity table the new xmlEntitiesTablePtr or NULL in case of error. 

An entity table 

An XML buffer.  An entity table 

xmlCleanupPredefinedEntities ()

void        xmlCleanupPredefinedEntities    (void);

Cleanup up the predefined entities table.

HTMLparser

HTMLparser

HTMLparser

Name

HTMLparser —
HTMLparser -- 

Synopsis

xmlChar *name); -int htmlIsAutoClosed (htmlDocPtr doc, - htmlNodePtr elem); -int htmlAutoCloseTag (htmlDocPtr doc, - const xmlChar *name, - htmlNodePtr elem); htmlEntityDescPtrhtmlParseFile (const char *filename, - const char *encoding); -void htmlFreeParserCtxt (htmlParserCtxtPtr ctxt); -htmlParserCtxtPtr htmlCreatePushParserCtxt (htmlSAXHandlerPtr sax, - void *user_data, - const char *chunk, - int size, - const char *filename, - xmlCharEncoding enc); -int htmlParseChunk (htmlParserCtxtPtr ctxt, - const char *chunk, - int size, - int terminate);

Description

Details

htmlParserCtxt

typedef xmlParserCtxt htmlParserCtxt;

htmlParserCtxtPtr

typedef xmlParserCtxtPtr htmlParserCtxtPtr;

htmlParserNodeInfo

typedef xmlParserNodeInfo htmlParserNodeInfo;

htmlSAXHandler

typedef xmlSAXHandler htmlSAXHandler;

htmlSAXHandlerPtr

typedef xmlSAXHandlerPtr htmlSAXHandlerPtr;

htmlParserInput

typedef xmlParserInput htmlParserInput;

htmlParserInputPtr

typedef xmlParserInputPtr htmlParserInputPtr;

htmlDocPtr

typedef xmlDocPtr htmlDocPtr;

htmlNodePtr

typedef xmlNodePtr htmlNodePtr;

The tag name the related htmlElemDescPtr or NULL if not found. 

the entity name the associated htmlEntityDescPtr if found, NULL otherwise. 

htmlIsAutoClosed ()

int         htmlIsAutoClosed                (htmlDocPtr doc,
-                                             htmlNodePtr elem);

The HTmL DtD allows a tag to implicitely close other tags. -The list is kept in htmlStartClose array. This function checks -if a tag is autoclosed by one of it's child

doc : the HTML document
elem : the HTML element
Returns :1 if autoclosed, 0 otherwise

htmlAutoCloseTag ()

int         htmlAutoCloseTag                (htmlDocPtr doc,
-                                             const xmlChar *name,
-                                             htmlNodePtr elem);

The HTmL DtD allows a tag to implicitely close other tags. -The list is kept in htmlStartClose array. This function checks -if the element or one of it's children would autoclose the -given tag.

doc : the HTML document
name : The tag name
elem : the HTML element
Returns :1 if autoclose, 0 otherwise

an HTML parser context  location to store the entity name the associated htmlEntityDescPtr if found, or NULL otherwise, -if non-NULL *str will have to be freed by the caller. 

an HTML parser context the value parsed (as an int) 

an HTML parser context 

a pointer to an array of xmlChar  a free form C string describing the HTML document encoding, or NULL  the SAX handler block  if using SAX, this pointer will be provided on callbacks.  the resulting document tree 

a pointer to an array of xmlChar  a free form C string describing the HTML document encoding, or NULL the resulting document tree 

the filename  a free form C string describing the HTML document encoding, or NULL  the SAX handler block  if using SAX, this pointer will be provided on callbacks.  the resulting document tree 

the filename  a free form C string describing the HTML document encoding, or NULL the resulting document tree

htmlFreeParserCtxt ()

void        htmlFreeParserCtxt              (htmlParserCtxtPtr ctxt);

Free all the memory used by a parser context. However the parsed -document in ctxt->myDoc is not freed.

ctxt : an HTML parser context

htmlCreatePushParserCtxt ()

htmlParserCtxtPtr htmlCreatePushParserCtxt  (htmlSAXHandlerPtr sax,
-                                             void *user_data,
-                                             const char *chunk,
-                                             int size,
-                                             const char *filename,
-                                             xmlCharEncoding enc);

Create a parser context for using the HTML parser in push mode -To allow content encoding detection, size should be >= 4 -The value of filename is used for fetching external entities -and error/warning reports.

sax : a SAX handler
user_data : The user data returned on SAX callbacks
chunk : a pointer to an array of chars
size : number of chars in the array
filename : an optional file name or URI
enc : an optional encoding
Returns :the new parser context or NULL

htmlParseChunk ()

int         htmlParseChunk                  (htmlParserCtxtPtr ctxt,
-                                             const char *chunk,
-                                             int size,
-                                             int terminate);

Parse a Chunk of memory

 
ctxt : an XML parser context
chunk : an char array
size : the size in byte of the chunk
terminate : last chunk indicator
Returns :zero if no error, the xmlParserErrors otherwise.

HTMLtree

HTMLtree

HTMLtree

Name

HTMLtree —
HTMLtree -- 

Synopsis

Description

Details

#define HTML_TEXT_NODE		XML_TEXT_NODE
#define HTML_TEXT_NODE

#define HTML_ENTITY_REF_NODE	XML_ENTITY_REF_NODE
#define HTML_ENTITY_REF_NODE

#define HTML_COMMENT_NODE	XML_COMMENT_NODE
#define HTML_COMMENT_NODE

the document  OUT: the memory pointer  OUT: the memory lenght 

the FILE*  the document 

the filename  the document  the number of byte written or -1 in case of failure. 

nanohttp

nanohttp

nanohttp

Name

nanohttp —
nanohttp -- 

Synopsis

Description

Details

The URL to load  the filename where the content should be saved  if available the Content-Type information will be -returned at that location -1 in case of failure, 0 incase of success. The contentType, -if provided must be freed by the caller 

The URL to load  the HTTP method to use  the input string if any  the Content-Type information IN and OUT  the extra headers 

The URL to load  if available the Content-Type information will be -returned at that location 

the HTTP context the HTTP return code for the request. 

the HTTP context  a buffer  the buffer length the number of byte read. 0 is an indication of an end of connection. --1 indicates a parameter error. 

the HTTP context  the filename where the content should be saved -1 in case of failure, 0 incase of success. 

the HTTP context 

parser

parser

parser

Name

parser —
parser -- 
xmlParserInputPtr; -typedef xmlParserInputPtr (*xmlExternalEntityLoader) + (const char *URL, + const char *ID, + xmlParserCtxtPtr context); +struct xmlParserNodeInfo; -typedef xmlParserNodeInfoSeq; @@ -169,7 +188,7 @@ enum xmlParserInputState; -typedef xmlParserCtxt; @@ -177,7 +196,7 @@ typedef xmlParserCtxtPtr; -typedef xmlSAXLocator; @@ -467,19 +486,6 @@ typedef xmlSAXHandlerPtr; -xmlParserInputPtr (*xmlExternalEntityLoader) - (const char *URL, - const char *ID, - xmlParserCtxtPtr context); extern const char *xmlParserVersionxmlSubstituteEntitiesDefaultValue; -void xmlCleanupParser (void); int xmlParserInputReadxmlChar *SystemID); void xmlDefaultSAXHandlerInit (void); -void htmlDefaultSAXHandlerInit (void); -void xmlInitParserCtxt (xmlParserCtxtPtr ctxt); void xmlFreeParserCtxt (xmlParserCtxtPtr ctxt); -void xmlSetupParserForBuffer (xmlChar *buffer, const char *filename); -xmlParserCtxtPtr xmlCreateDocParserCtxt (xmlChar *cur); -xmlParserCtxtPtr xmlCreatePushParserCtxt (xmlSAXHandlerPtr sax, - void *user_data, - const char *chunk, - int size, - const char *filename); -int xmlParseChunk (xmlParserCtxtPtr ctxt, - const char *chunk, - int size, - int terminate); +void xmlDefaultSAXHandlerInit (void); +void htmlDefaultSAXHandlerInit (void); const xmlParserNodeInfo

Description

Details

#define XML_DEFAULT_VERSION	"1.0"
#define XML_DEFAULT_VERSION

xmlParserInputPtr

xmlExternalEntityLoader ()

typedef xmlParserInput *xmlParserInputPtr;
xmlParserInputPtr (*xmlExternalEntityLoader) + (const char *URL, + const char *ID, + xmlParserCtxtPtr context);

URL : 
ID : 
context : 
Returns : 

xmlParserNodeInfo

struct xmlParserNodeInfo

typedef _xmlParserNodeInfo xmlParserNodeInfo;
struct xmlParserNodeInfo { + const struct _xmlNode* node; + /* Position & line # that text that created the node begins & ends on */ + unsigned long begin_pos; + unsigned long begin_line; + unsigned long end_pos; + unsigned long end_line; +};

xmlParserNodeInfoSeq

struct xmlParserNodeInfoSeq

typedef _xmlParserNodeInfoSeq xmlParserNodeInfoSeq;
struct xmlParserNodeInfoSeq { + unsigned long maximum; + unsigned long length; + xmlParserNodeInfo* buffer; +};

xmlParserNodeInfoSeqPtr

typedef xmlParserNodeInfoSeq *xmlParserNodeInfoSeqPtr;

xmlParserCtxt

struct xmlParserCtxt

typedef _xmlParserCtxt xmlParserCtxt;

xmlParserCtxtPtr

typedef xmlParserCtxt *xmlParserCtxtPtr;

xmlSAXLocator

typedef _xmlSAXLocator xmlSAXLocator;

xmlSAXLocatorPtr

typedef xmlSAXLocator *xmlSAXLocatorPtr;
struct xmlParserCtxt { + struct _xmlSAXHandler *sax; /* The SAX handler */ + void *userData; /* the document being built */ + xmlDocPtr myDoc; /* the document being built */ + int wellFormed; /* is the document well formed */ + int replaceEntities; /* shall we replace entities ? */ + const xmlChar *version; /* the XML version string */ + const xmlChar *encoding; /* encoding, if any */ + int standalone; /* standalone document */ + int html; /* are we parsing an HTML document */ + + /* Input stream stack */ + xmlParserInputPtr input; /* Current input stream */ + int inputNr; /* Number of current input streams */ + int inputMax; /* Max number of input streams */ + xmlParserInputPtr *inputTab; /* stack of inputs */ + + /* Node analysis stack only used for DOM building */ + xmlNodePtr node; /* Current parsed Node */ + int nodeNr; /* Depth of the parsing stack */ + int nodeMax; /* Max depth of the parsing stack */ + xmlNodePtr *nodeTab; /* array of nodes */ + + int record_info; /* Whether node info should be kept */ + xmlParserNodeInfoSeq node_seq; /* info about each node parsed */ + + int errNo; /* error code */ + + int hasExternalSubset; /* reference and external subset */ + int hasPErefs; /* the internal subset has PE refs */ + int external; /* are we parsing an external entity */ + + int valid; /* is the document valid */ + int validate; /* shall we try to validate ? */ + xmlValidCtxt vctxt; /* The validity context */ + + xmlParserInputState instate; /* current type of input */ + int token; /* next char look-ahead */ + + char *directory; /* the data directory */ + + /* Node name stack only used for HTML parsing */ + xmlChar *name; /* Current parsed Node */ + int nameNr; /* Depth of the parsing stack */ + int nameMax; /* Max depth of the parsing stack */ + xmlChar * *nameTab; /* array of nodes */ + + long nbChars; /* number of xmlChar processed */ + long checkIndex; /* used by progressive parsing lookup */ +};

xmlParserCtxtPtr

struct xmlSAXLocator

struct xmlSAXLocator {
+    const xmlChar *(*getPublicId)(void *ctx);
+    const xmlChar *(*getSystemId)(void *ctx);
+    int (*getLineNumber)(void *ctx);
+    int (*getColumnNumber)(void *ctx);
+};

xmlSAXLocatorPtr

resolveEntitySAXFunc ()

xmlSAXHandlerPtr

typedef xmlSAXHandler *xmlSAXHandlerPtr;

xmlExternalEntityLoader ()

xmlParserInputPtr (*xmlExternalEntityLoader)
-                                            (const char *URL,
-                                             const char *ID,
-                                             xmlParserCtxtPtr context);

URL : 
ID : 
context : 
Returns : 

xmlCleanupParser ()

void        xmlCleanupParser                (void);

Cleanup function for the XML parser. It tries to reclaim all -parsing related global memory allocated for the parser processing. -It doesn't deallocate any document related memory. Calling this -function should not prevent reusing the parser.

an XML parser input  an indicative size for the lookahead the number of xmlChars read, or -1 in case of error, 0 indicate the -end of this entity 

an XML parser input  an indicative size for the lookahead the number of xmlChars read, or -1 in case of error, 0 indicate the -end of this entity 

the input xmlChar * a new xmlChar * or NULL 

the input xmlChar *  the len of cur a new xmlChar * or NULL 

the xmlChar * array (haystack)  the index of the first char (zero based)  the length of the substring the xmlChar * for the first occurence or NULL. 

the xmlChar * array  the xmlChar to search the xmlChar * for the first occurence or NULL. 

the xmlChar * array (haystack)  the xmlChar to search (needle) the xmlChar * for the first occurence or NULL. 

the first xmlChar *  the second xmlChar * the integer result of the comparison 

the first xmlChar *  the second xmlChar *  the max comparison length the integer result of the comparison 

length of a xmlChar's string

lenght of a xmlChar's string

the xmlChar * array the number of xmlChar contained in the ARRAY. 

the original xmlChar * array  the xmlChar * array added a new xmlChar * containing the concatenated string. 

the original xmlChar * array  the xmlChar * array added  the length of add a new xmlChar * containing the concatenated string. 

a pointer to an array of xmlChar the resulting document tree 

an pointer to a char array  the size of the array the resulting document tree 

the filename the resulting document tree 

int 0 or 1  the last value for 0 for no substitution, 1 for substitution. 

a pointer to an array of xmlChar the resulting document tree 

an pointer to a char array  the size of the array the resulting document tree 

the filename the resulting document tree 

an XML parser context 0, -1 in case of error. the parser context is augmented -as a result of the parsing. 

the SAX handler block  a pointer to an array of xmlChar  work in recovery mode, i.e. tries to read no Well Formed -documents the resulting document tree 

a SAX handler  The user data returned on SAX callbacks  a file name 0 in case of success or a error number otherwise 

a SAX handler  The user data returned on SAX callbacks  an in-memory XML document input  the length of the XML document in bytes 0 in case of success or a error number otherwise 

the SAX handler block  an pointer to a char array  the size of the array  work in recovery mode, i.e. tries to read not Well Formed -documents the resulting document tree 

the SAX handler block  the filename  work in recovery mode, i.e. tries to read no Well Formed -documents the resulting document tree 

a NAME* containing the External ID of the DTD  a NAME* containing the URL to the DTD the resulting xmlDtdPtr or NULL in case of error. 

the SAX handler block  a NAME* containing the External ID of the DTD  a NAME* containing the URL to the DTD the resulting xmlDtdPtr or NULL in case of error. 

xmlDefaultSAXHandlerInit ()

void        xmlDefaultSAXHandlerInit        (void);

Initialize the default SAX handler

htmlDefaultSAXHandlerInit ()

void        htmlDefaultSAXHandlerInit       (void);

Initialize the default SAX handler

an HTML parser context 

an XML parser context 

xmlFreeParserCtxt ()

void        xmlFreeParserCtxt               (xmlParserCtxtPtr ctxt);

Free all the memory used by a parser context. However the parsed -document in ctxt->myDoc is not freed.

ctxt : an XML parser context

an XML parser context  a xmlChar * buffer  a file name 

xmlCreateDocParserCtxt ()

xmlDefaultSAXHandlerInit ()

xmlParserCtxtPtr xmlCreateDocParserCtxt     (xmlChar *cur);
void xmlDefaultSAXHandlerInit (void);

Create a parser context for an XML in-memory document.

Initialize the default SAX handler

cur : a pointer to an array of xmlChar
Returns :the new parser context or NULL

xmlCreatePushParserCtxt ()

htmlDefaultSAXHandlerInit ()

xmlParserCtxtPtr xmlCreatePushParserCtxt    (xmlSAXHandlerPtr sax,
-                                             void *user_data,
-                                             const char *chunk,
-                                             int size,
-                                             const char *filename);
void htmlDefaultSAXHandlerInit (void);

Create a parser context for using the XML parser in push mode -To allow content encoding detection, size should be >= 4 -The value of filename is used for fetching external entities -and error/warning reports.

Initialize the default SAX handler

sax : a SAX handler
user_data : The user data returned on SAX callbacks
chunk : a pointer to an array of chars
size : number of chars in the array
filename : an optional file name or URI
Returns :the new parser context or NULL

xmlParseChunk ()

int         xmlParseChunk                   (xmlParserCtxtPtr ctxt,
-                                             const char *chunk,
-                                             int size,
-                                             int terminate);

Parse a Chunk of memory

ctxt : an XML parser context
chunk : an char array
size : the size in byte of the chunk
terminate : last chunk indicator
Returns :zero if no error, the xmlParserErrors otherwise.

an XML parser context  an XML node within the tree an xmlParserNodeInfo block pointer or NULL 

a node info sequence pointer 

a node info sequence pointer 

a node info sequence pointer  an XML node pointer a long indicating the position of the record 

an XML parser context  a node info sequence pointer 

parserInternals

parserInternals

parserInternals

Name

parserInternals —
parserInternals -- 

Synopsis

xmlParserCtxtPtr xmlCreateDocParserCtxt ( (char *buffer, int size); void xmlFreeParserCtxt (

Description

Details

#define XML_MAX_NAMELEN 1000
#define XML_MAX_NAMELEN

#define SKIPCHARVAL(p) (p)++;
#define SKIPCHARVAL(p)

the filename the new parser context or NULL 

an pointer to a char array  the size of the array the new parser context or NULL 

the xmlParserCtxtPtr or NULL 

the parser context  the encoding value (number) 

an XML parser context  an XML entity pointer. 

an XML parser context  an Entity pointer the new input stream or NULL 

an XML parser context  an XML parser input fragment (entity, XML fragment ...). 

an XML parser context the current xmlChar in the parser context 

an xmlParserInputPtr 

an XML parser context  the filename to use as entity the new input stream or NULL in case of error 

an XML parser context  a xmlChar **  the local part, and prefix is updated -to get the Prefix if any. 

an XML parser context the namespace name or NULL 

an XML parser context  a xmlChar **  the local part, and prefix is updated -to get the Prefix if any. 

an XML parser context the namespace name 

an XML parser context the string parser or NULL. 

This is what the older xml-name Working Draft specified, a bunch of other stuff may still rely on it, so support is still here as -if it was declared on the root of the Tree:-(

To be removed at next drop of binary compatibility

an XML parser context 

an XML parser context the Name parsed or NULL 

an XML parser context the Name parsed or NULL 

an XML parser context the Nmtoken parsed or NULL 

an XML parser context  if non-NULL store a copy of the original entity value the EntityValue parsed with reference substitued or NULL 

[10] AttValue ::= '"' ([^<&"] | Reference)* '"' | "'" ([^<&'] | Reference)* "'"

3.3.3 Attribute-Value Normalization: -Before the value of an attribute is passed to the application or -checked for validity, the XML processor must normalize it as follows: -- a character reference is processed by appending the referenced -character to the attribute value -- an entity reference is processed by recursively processing the -replacement text of the entity -- a whitespace character (x20, xD, xA, x9) is processed by -appending x20 to the normalized value, except that only a single -x20 is appended for a "xDxA" sequence that is part of an external -parsed entity or the literal entity value of an internal parsed entity -- other characters are processed by appending them to the normalized value -If the declared value is not CDATA, then the XML processor must further -process the normalized attribute value by discarding any leading and -trailing space (x20) characters, and by replacing sequences of space -(x20) characters by a single space (x20) character. -All attributes for which no declaration has been read should be treated -by a non-validating parser as if declared CDATA.

an XML parser context the AttValue parsed or NULL. The value has to be freed by the caller. 

an XML parser context the SystemLiteral parsed or NULL 

an XML parser context the PubidLiteral parsed or NULL. 

an XML parser context  int indicating whether we are within a CDATA section 

an XML parser context  a xmlChar** receiving PubidLiteral  indicate whether we should restrict parsing to only -production [75], see NOTE below the function returns SystemLiteral and in the second -case publicID receives PubidLiteral, is strict is off -it is possible to return NULL and have publicID set. 

an XML parser context 

an XML parser context the PITarget name or NULL 

an XML parser context 

an XML parser context 

an XML parser context 

an XML parser context  Receive a possible fixed default value for the attribute  XML_ATTRIBUTE_NONE, XML_ATTRIBUTE_REQUIRED, XML_ATTRIBUTE_IMPLIED -or XML_ATTRIBUTE_FIXED.  

an XML parser context  the notation attribute tree built while parsing 

an XML parser context  the enumeration attribute tree built while parsing 

an XML parser context  the enumeration tree built while parsing  XML_ATTRIBUTE_ENUMERATION or XML_ATTRIBUTE_NOTATION 

[ VC: IDREF ] Values of type IDREF must match the Name production, and values -of type IDREFS must match Names; each IDREF Name must match the value +of type IDREFS must match Names; TODO each IDREF Name must match the value of an ID attribute on some element in the XML document; i.e. IDREF values must match the value of some ID attribute.

[ VC: Entity Name ] Values of type ENTITY must match the Name production, values -of type ENTITIES must match Names; each Entity Name must match the +of type ENTITIES must match Names; TODO each Entity Name must match the name of an unparsed entity declared in the DTD.

[ VC: Name Token ] @@ -5051,7 +4999,7 @@ CLASS="PARAMETER" WIDTH="80%" ALIGN="LEFT" VALIGN="TOP" -> an XML parser context  the enumeration tree built while parsing the attribute type 

an XML parser context 

an XML parser context  the list of the xmlElementContentPtr describing the element choices 

an XML parser context  the tree of xmlElementContentPtr describing the element -hierarchy. 

an XML parser context  the name of the element being defined.  the Element Content pointer will be stored here if any  the type of element content XML_ELEMENT_TYPE_xxx 

an XML parser context the type of the element, or -1 in case of error 

an XML parser context 

an XML parser context the value parsed (as an int), 0 in case of error 

an XML parser context the xmlEntityPtr if found, or NULL otherwise. 

an XML parser context 

an XML parser context 

an XML parser context 

an XML parser context  a xmlChar ** used to store the value of the attribute the attribute name, and the value in *value. 

[NS 10] EmptyElement ::= '<' QName (S Attribute)* S? '/>'

Returne the element name parsed

an XML parser context 

an XML parser context 

an XML parser context 

an XML parser context 

an XML parser context 

an XML parser context the string giving the XML version number, or NULL 

an XML parser context the version string, e.g. "1.0" 

an XML parser context the encoding name value or NULL 

an XML parser context the encoding value or NULL 

an XML parser context 1 if standalone, 0 otherwise 

an XML parser context 

an XML parser context 

an XML parser context  the external identifier  the system identifier (or URL) 

#define XML_SUBSTITUTE_NONE	0
#define XML_SUBSTITUTE_NONE

#define XML_SUBSTITUTE_REF	1
#define XML_SUBSTITUTE_REF

#define XML_SUBSTITUTE_PEREF	2
#define XML_SUBSTITUTE_PEREF

#define XML_SUBSTITUTE_BOTH 	3
#define XML_SUBSTITUTE_BOTH

the parser context  the len to decode (in bytes !), -1 for no size limit  combination of XML_SUBSTITUTE_REF and XML_SUBSTITUTE_PEREF  an end marker xmlChar, 0 if none  an end marker xmlChar, 0 if none  an end marker xmlChar, 0 if none A newly allocated string with the substitution done. The caller -must deallocate it ! 

tree

tree

tree

Name

tree —
tree -- 

Synopsis

xmlRefPtr; -enum xmlBufferAllocationScheme; -typedef xmlBuffer; -typedef xmlBufferPtr; -typedef xmlNode; @@ -238,7 +232,7 @@ typedef xmlNodePtr; -typedef xmlDoc; @@ -246,6 +240,14 @@ typedef xmlDocPtr; +struct xmlBuffer; +typedef xmlBufferPtr; extern xmlNsPtr baseDTDxmlIndentTreeOutput; -extern xmlBufferAllocationScheme xmlBufferAllocScheme; xmlBufferPtrxmlBufferCreate (void); -xmlBufferPtr xmlBufferCreateSize (size_t size); void xmlBufferFreexmlBufferPtr buf); -const xmlChar* xmlBufferContent (const xmlBufferPtr buf); -int xmlBufferUse (const xmlBufferPtr buf); -void xmlBufferSetAllocationScheme (xmlBufferPtr buf, - xmlBufferAllocationScheme scheme); -int xmlBufferLength (const xmlBufferPtr buf); xmlDtdPtrxmlNodePtr xmlNewDocRawNode (xmlDocPtr doc, - xmlNsPtr ns, - const xmlChar *name, - const xmlChar *content); -xmlNodePtr xmlNewNode (xmlNodePtr xmlNewTextChild (xmlNodePtr parent, - xmlNsPtr ns, - const xmlChar *name, - const xmlChar *content); -xmlNodePtr xmlNewDocText (xmlNodePtr xmlDocGetRootElement (xmlDocPtr doc); -xmlNodePtr xmlGetLastChild (xmlNodePtr xmlDocSetRootElement (xmlDocPtr doc, - xmlNodePtr root); -void xmlNodeSetName (xmlNodePtr cur, - const xmlChar *name); -xmlNodePtr xmlAddChild (xmlNodePtr xmlReplaceNode (xmlNodePtr old, - xmlNodePtr cur); -xmlNodePtr xmlAddSibling (xmlNodePtr elem); -xmlNodePtr xmlAddPrevSibling (xmlNodePtr cur, - xmlNodePtr elem); -xmlNodePtr xmlAddNextSibling (xmlNodePtr cur, - xmlNodePtr elem); void xmlUnlinkNodexmlNodePtr cur); -int xmlRemoveProp (xmlAttrPtr cur); xmlNsPtrxmlChar *name); xmlChar* xmlGetNsProp (xmlNodePtr node, - const xmlChar *name, - const xmlChar *nameSpace); -xmlNodePtr xmlChar *lang); -xmlChar* xmlNodeGetBase (xmlDocPtr doc, - xmlNodePtrxmlRemoveProp (xmlAttrPtr cur); int xmlDocPtr cur); -void xmlElemDump (FILE *f, - xmlDocPtr cur, - xmlNodePtr elem); int xmlSaveFile

Description

Details

#define CHAR xmlChar
#define CHAR

#define BAD_CAST (xmlChar *)
#define BAD_CAST

xmlNotationPtr

typedef xmlNotation *xmlNotationPtr;

xmlEnumerationPtr

typedef xmlEnumeration *xmlEnumerationPtr;

xmlAttributePtr

typedef xmlAttribute *xmlAttributePtr;

xmlElementContentPtr

typedef xmlElementContent *xmlElementContentPtr;

xmlElementPtr

typedef xmlElement *xmlElementPtr;

xmlNsPtr

typedef xmlNs *xmlNsPtr;

xmlDtdPtr

typedef xmlDtd *xmlDtdPtr;

xmlAttrPtr

typedef xmlAttr *xmlAttrPtr;

xmlIDPtr

typedef xmlID *xmlIDPtr;

xmlRefPtr

typedef xmlRef *xmlRefPtr;

enum xmlBufferAllocationScheme

typedef enum {
-    XML_BUFFER_ALLOC_DOUBLEIT,
-    XML_BUFFER_ALLOC_EXACT
-} xmlBufferAllocationScheme;

Sets the allocation scheme for this buffer

xmlBuffer

typedef _xmlBuffer xmlBuffer;

xmlBufferPtr

typedef xmlBuffer *xmlBufferPtr;

xmlNode

struct xmlNode

typedef _xmlNode xmlNode;
struct xmlNode { +#ifndef XML_WITHOUT_CORBA + void *_private; /* for Corba, must be first ! */ + void *vepv; /* for Corba, must be next ! */ +#endif + xmlElementType type; /* type number in the DTD, must be third ! */ + struct _xmlDoc *doc; /* the containing document */ + struct _xmlNode *parent; /* child->parent link */ + struct _xmlNode *next; /* next sibling link */ + struct _xmlNode *prev; /* previous sibling link */ + struct _xmlNode *childs; /* parent->childs link */ + struct _xmlNode *last; /* last child link */ + struct _xmlAttr *properties;/* properties list */ + const xmlChar *name; /* the name of the node, or the entity */ + xmlNs *ns; /* pointer to the associated namespace */ + xmlNs *nsDef; /* namespace definitions on this node */ +#ifndef XML_USE_BUFFER_CONTENT + xmlChar *content; /* the content */ +#else + xmlBufferPtr content; /* the content in a buffer */ +#endif +};

xmlNodePtr

typedef _xmlNode *xmlNodePtr;

xmlDoc

struct xmlDoc

typedef _xmlDoc xmlDoc;
struct xmlDoc { +#ifndef XML_WITHOUT_CORBA + void *_private; /* for Corba, must be first ! */ + void *vepv; /* for Corba, must be next ! */ +#endif + xmlElementType type; /* XML_DOCUMENT_NODE, must be second ! */ + char *name; /* name/filename/URI of the document */ + const xmlChar *version; /* the XML version string */ + const xmlChar *encoding; /* encoding, if any */ + int compression;/* level of zlib compression */ + int standalone; /* standalone document (no external refs) */ + struct _xmlDtd *intSubset; /* the document internal subset */ + struct _xmlDtd *extSubset; /* the document external subset */ + struct _xmlNs *oldNs; /* Global namespace, the old way */ + struct _xmlNode *root; /* the document tree */ + void *ids; /* Hash table for ID attributes if any */ + void *refs; /* Hash table for IDREFs attributes if any */ +};

xmlDocPtr

struct xmlBuffer

typedef xmlDoc *xmlDocPtr;
struct xmlBuffer { + xmlChar *content; /* The buffer content UTF8 */ + unsigned int use; /* The buffer size used */ + unsigned int size; /* The buffer size */ + xmlBufferAllocationScheme alloc; /* The realloc method */ +};

xmlBufferPtr

xmlBufferAllocScheme

extern xmlBufferAllocationScheme xmlBufferAllocScheme; /* alloc scheme to use */

the new structure. 

xmlBufferCreateSize ()

xmlBufferPtr xmlBufferCreateSize            (size_t size);

routine to create an XML buffer.

size : initial size of buffer
Returns :the new structure.

the buffer to free 

the file output  the buffer to dump the number of xmlChar written 

Add a string range to an XML buffer. if len == -1, the lenght of -str is recomputed.

Add a string range to an XML buffer.

the buffer to dump  the xmlChar string  the number of xmlChar to add 

the buffer to dump  the xmlChar string 

the buffer to dump  the C char string 

the buffer to dump  the number of xmlChar to remove the number of xmlChar removed, or -1 in case of failure. 

the buffer

xmlBufferContent ()

const xmlChar* xmlBufferContent             (const xmlBufferPtr buf);

buf : the buffer to resize
Returns :the internal content

xmlBufferUse ()

int         xmlBufferUse                    (const xmlBufferPtr buf);

buf : 
Returns : 

xmlBufferSetAllocationScheme ()

void        xmlBufferSetAllocationScheme    (xmlBufferPtr buf,
-                                             xmlBufferAllocationScheme scheme);

buf : 
scheme : 

xmlBufferLength ()

int         xmlBufferLength                 (const xmlBufferPtr buf);

buf : the buffer
Returns :the length of data in the internal content

the document pointer  the DTD name  the external ID  the system ID a pointer to the new DTD structure 

the document pointer  the DTD name  the external ID  the system ID a pointer to the new DTD structure 

the DTD structure to free up 

Creation of a Namespace, the old way using PI and without scoping -DEPRECATED !!! -Will be removed at next major release !

Creation of a Namespace, the old way using PI and without scoping, to AVOID.

the document carrying the namespace  the URI associated  the prefix for the namespace NULL this functionnality had been removed 

Creation of a new Namespace. This function will refuse to create -a namespace with a similar prefix than an existing one present on this -node.

Creation of a new Namespace.

the element carrying the namespace  the URI associated  the prefix for the namespace returns a new namespace pointer or NULL 

the namespace pointer 

xmlChar string giving the version of XML "1.0" a new document 

pointer to the document -@:  

the document  the name of the attribute  the value of the attribute a pointer to the attribute 

the holding node  the name of the attribute  the value of the attribute a pointer to the attribute 

the holding node  the namespace  the name of the attribute  the value of the attribute a pointer to the attribute 

the first property in the list 

Free one attribute, all the content is freed too

Free one property, all the childs are freed too.

an attribute 

the element where the attribute will be grafted  the attribute  a new xmlAttrPtr, or NULL in case of error. 

the element where the attributes will be grafted  the first attribute  a new xmlAttrPtr, or NULL in case of error. 

the dtd  a new xmlDtdPtr, or NULL in case of error. 

the document  if 1 do a recursive copy.  a new xmlDocPtr, or NULL in case of error. 

content -are optionnal (NULL). -NOTE: content is supposed to be a piece of XML CDATA, so it allow entities -references, but XML special chars need to be escaped first by using -xmlEncodeEntitiesReentrant(). Use xmlNewDocRawNode() if you don't -need entities support.

doc : the document
ns : namespace if any
name : the node name
content : the XML text content if any
Returns :a pointer to the new node object.

xmlNewDocRawNode ()

xmlNodePtr  xmlNewDocRawNode                (xmlDocPtr doc,
-                                             xmlNsPtr ns,
-                                             const xmlChar *name,
-                                             const xmlChar *content);

Creation of a new node element within a document. ns and content are optionnal (NULL).

the document  namespace if any  the node name  the text content if any a pointer to the new node object. 

namespace if any  the node name a pointer to the new node object. 

content parameters are optionnal (NULL). If content is non NULL, -a child list containing the TEXTs and ENTITY_REFs node will be created. -NOTE: content is supposed to be a piece of XML CDATA, so it allow entities -references, but XML special chars need to be escaped first by using -xmlEncodeEntitiesReentrant(). Use xmlNewTextChild() if entities -support is not needed.

the parent node  a namespace if any  the name of the child  the XML content of the child if any. a pointer to the new node object. 

xmlNewTextChild ()

xmlNodePtr  xmlNewTextChild                 (xmlNodePtr parent,
-                                             xmlNsPtr ns,
-                                             const xmlChar *name,
-                                             const xmlChar *content);

Creation of a new child element, added at the end of parent childs list. -ns and content parameters are optionnal (NULL). If content is non NULL, -a child TEXT node will be created containing the string content.

parent : the parent node
ns : a namespace if any
name : the name of the child
content : the text content of the child if any.
Returns :a pointer to the new node object.

the document  the text content a pointer to the new node object. 

the text content a pointer to the new node object. 

the processing instruction name  the PI content a pointer to the new node object. 

the document  the text content  the text len. a pointer to the new node object. 

the text content  the text len. a pointer to the new node object. 

the document  the comment content a pointer to the new node object. 

the comment content a pointer to the new node object. 

the document  the CData block content content  the length of the block a pointer to the new node object. 

the document  the reference name, or the reference string with & and ; a pointer to the new node object. 

the node  if 1 do a recursive copy.  a new xmlNodePtr, or NULL in case of error. 

the first node in the list.  a new xmlNodePtr, or NULL in case of error. 

xmlDocGetRootElement ()

xmlNodePtr  xmlDocGetRootElement            (xmlDocPtr doc);

Get the root element of the document (doc->root is a list -containing possibly comments, PIs, etc ...).

doc : the document
Returns :the xmlNodePtr for the root or NULL

the parent node the last child or NULL if none. 

the node 1 yes, 0 no 

xmlDocSetRootElement ()

xmlNodePtr  xmlDocSetRootElement            (xmlDocPtr doc,
-                                             xmlNodePtr root);

Set the root element of the document (doc->root is a list -containing possibly comments, PIs, etc ...).

doc : the document
root : the new document root element
Returns :the old root element if any was found

xmlNodeSetName ()

void        xmlNodeSetName                  (xmlNodePtr cur,
-                                             const xmlChar *name);

Searches the language of a node, i.e. the values of the xml:lang -attribute or the one carried by the nearest ancestor.

cur : the node being changed
name : the new tag name

the parent node  the child node the child or NULL in case of error. 

xmlReplaceNode ()

xmlNodePtr  xmlReplaceNode                  (xmlNodePtr old,
-                                             xmlNodePtr cur);

Unlink the old node from it's current context, prune the new one -at the same place. If cur was already inserted in a document it is -first unlinked from its existing context.

old : the old node
cur : the node
Returns :the old node

Add a new element elem to the list of siblings of Add a new element to the list of siblings of cur -If the new element was already inserted in a document it is -first unlinked from its existing context.

the child node  the new node the new element or NULL in case of error. 

xmlAddPrevSibling ()

xmlNodePtr  xmlAddPrevSibling               (xmlNodePtr cur,
-                                             xmlNodePtr elem);

Add a new element elem as the previous siblings of cur -If the new element was already inserted in a document it is -first unlinked from its existing context.

cur : the child node
elem : the new node
Returns :the new element or NULL in case of error.

xmlAddNextSibling ()

xmlNodePtr  xmlAddNextSibling               (xmlNodePtr cur,
-                                             xmlNodePtr elem);

Add a new element elem as the next siblings of cur -If the new element was already inserted in a document it is -first unlinked from its existing context.

cur : the child node
elem : the new node
Returns :the new element or NULL in case of error.

the node 

the first text node  the second text node being merged the first text node augmented 

the node  the content  content lenght 

the first node in the list 

the node 

xmlRemoveProp ()

int         xmlRemoveProp                   (xmlAttrPtr cur);

Unlink and free one attribute, all the content is freed too -Note this doesn't work for namespace definition attributes

cur : an attribute
Returns :0 if success and -1 in case of error.

the document  the current node  the namespace string the namespace pointer or NULL. 

the document  the current node  the namespace value the namespace pointer or NULL. 

the document  the current node an NULL terminated array of all the xmlNsPtr found -that need to be freed by the caller or NULL if no -namespace if defined 

a node in the document  a namespace pointer 

the namespace  a new xmlNsPtr, or NULL in case of error. 

the first namespace  a new xmlNsPtr, or NULL in case of error. 

the node  the attribute name  the attribute value the attribute pointer. 

Search and get the value of an attribute associated to a node -This does the entity substitution. -This function looks in DTD attribute declaration for FIXED or -default declaration values unless DTD use has been turned off.

the node  the attribute name the attribute value or NULL if not found. -It's up to the caller to free the memory. 

xmlGetNsProp ()

xmlChar*    xmlGetNsProp                    (xmlNodePtr node,
-                                             const xmlChar *name,
-                                             const xmlChar *nameSpace);

Search and get the value of an attribute associated to a node -This attribute has to be anchored in the namespace specified. -This does the entity substitution. -This function looks in DTD attribute declaration for FIXED or -default declaration values unless DTD use has been turned off.

node : the node
name : the attribute name
nameSpace : the URI of the namespace
Returns :the attribute value or NULL if not found. -It's up to the caller to free the memory.

the document  the value of the attribute a pointer to the first child 

the document  the value of the text  the length of the string value a pointer to the first child 

the document  a Node list  should we replace entity contents or show their external form a pointer to the string copy, the calller must free it. 

the node being modified  the new value of the content 

the node being modified  the new value of the content  the size of content 

the node being modified  extra content 

the node being modified  extra content  the size of content 

the node being read a new xmlChar * or NULL if no content is available. -It's up to the caller to free the memory. 

the node being checked a pointer to the lang value, or NULL if not found -It's up to the caller to free the memory. 

Set the language of a node, i.e. the values of the xml:lang -attribute.

Searches the language of a node, i.e. the values of the xml:lang +attribute or the one carried by the nearest ancestor.

the node being changed  the langage description 

xmlNodeGetBase ()

xmlRemoveProp ()

xmlChar*    xmlNodeGetBase                  (xmlDocPtr doc,
-                                             xmlNodePtrint         xmlRemoveProp                   (xmlAttrPtr cur);

Searches for the BASE URL. The code should work on both XML -and HTML document even if base mechanisms are completely different.

Unlink and free one attribute, all the content is freed too +Note this doesn't work for namespace definition attributes

doc : the document the node pertains tocur : the node being checked a pointer to the base URL, or NULL if not found -It's up to the caller to free the memory. 

the XML buffer  the string to add 

the XML buffer output  the string to add 

the XML buffer output  the string to add 

the document  OUT: the memory pointer  OUT: the memory lenght 

the FILE*cur : the document

xmlElemDump ()

void        xmlElemDump                     (FILE *f,
-                                             xmlDocPtr cur,
-                                             xmlNodePtr elem);

Dump an XML/HTML node, recursive behaviour,children are printed too.

the current node
f : 
elem : 

Dump an XML document to a file. Will use compression if -compiled in and enabled. If filename is "-" the stdout file is -used.

the filename  the document  the number of file written or -1 in case of failure. 

the document 0 (uncompressed) to 9 (max compression) 

the document  the compression ratio 

0 (uncompressed) to 9 (max compression) 

the compression ratio 

valid

valid

valid

Name

valid —
valid -- 

Synopsis

Description

Details

#define XML_MIN_NOTATION_TABLE	32
#define XML_MIN_NOTATION_TABLE

xmlNotationTablePtr

typedef xmlNotationTable *xmlNotationTablePtr;

#define XML_MIN_ELEMENT_TABLE	32
#define XML_MIN_ELEMENT_TABLE

xmlElementTablePtr

typedef xmlElementTable *xmlElementTablePtr;

#define XML_MIN_ATTRIBUTE_TABLE	32
#define XML_MIN_ATTRIBUTE_TABLE

xmlAttributeTablePtr

typedef xmlAttributeTable *xmlAttributeTablePtr;

#define XML_MIN_ID_TABLE	32
#define XML_MIN_ID_TABLE

xmlIDTablePtr

typedef xmlIDTable *xmlIDTablePtr;

#define XML_MIN_REF_TABLE	32
#define XML_MIN_REF_TABLE

xmlRefTablePtr

typedef xmlRefTable *xmlRefTablePtr;

the validation context  pointer to the DTD  the entity name  the public identifier or NULL  the system identifier or NULL NULL if not, othervise the entity 

A notation table the new xmlNotationTablePtr or NULL in case of error. 

An notation table 

the XML buffer output  A notation table 

the subelement name or NULL  the type of element content decl NULL if not, othervise the new element content structure 

An element content pointer. the new xmlElementContentPtr or NULL in case of error. 

the element content tree to free 

the validation context  pointer to the DTD  the entity name  the element type  the element content tree or NULL NULL if not, othervise the entity 

An element table the new xmlElementTablePtr or NULL in case of error. 

An element table 

the XML buffer output  An element table 

the enumeration name or NULL the xmlEnumerationPtr just created or NULL in case -of error. 

the tree to free. 

the tree to copy. the xmlEnumerationPtr just created or NULL in case -of error. 

the validation context  pointer to the DTD  the element name  the attribute name  the attribute type  the attribute default type  the attribute default value  if it's an enumeration, the associated list NULL if not, othervise the entity 

An attribute table the new xmlAttributeTablePtr or NULL in case of error. 

An attribute table 

the XML buffer output  An attribute table 

the validation context  pointer to the document  the value name  the attribute holding the ID NULL if not, othervise the new xmlIDPtr 

An id table 

pointer to the document  the ID value NULL if not found, otherwise the xmlAttrPtr defining the ID 

the document  the element carrying the attribute  the attribute 0 or 1 depending on the lookup result 

the validation context  pointer to the document  the value name  the attribute holding the Ref NULL if not, othervise the new xmlRefPtr 

An ref table 

the document  the element carrying the attribute  the attribute 0 or 1 depending on the lookup result 

the validation context  a document instance 1 if valid or 0 otherwise 

the validation context  a document instance  an element definition 1 if valid or 0 otherwise 

the validation context  a document instance  an attribute definition 1 if valid or 0 otherwise 

an attribute type  an attribute value 1 if valid or 0 otherwise 

the validation context  a document instance  a notation definition 1 if valid or 0 otherwise 

Try to validate the document against the dtd instance

Try to validate the dtd instance

basically it does check all the definitions in the DtD.

the validation context  a document instance  a dtd instance 1 if valid or 0 otherwise 

the validation context  a document instance 1 if valid or 0 otherwise 

the validation context  a document instance  an element instance 1 if valid or 0 otherwise 

the validation context  a document instance  an element instance 1 if valid or 0 otherwise 

the validation context  a document instance  an element instance  an attribute instance  the attribute value (without entities processing) 1 if valid or 0 otherwise 

the validation context  a document instance 1 if valid or 0 otherwise 

the validation context  the document  the notation name to check 1 if valid or 0 otherwise 

the document  the element name 0 if no, 1 if yes, and -1 if no element description is available 

a pointer to the DtD to search  the element name  the attribute name the xmlAttributePtr if found or NULL 

a pointer to the DtD to search  the notation name the xmlNotationPtr if found or NULL 

a pointer to the DtD to search  the element name the xmlElementPtr if found or NULL 

an element to insert after  an element to insert next  an array to store the list of child names  the size of the array the number of element in the list, or -1 in case of error. If -the function returns the value max the caller is invited to grow the -receiving array and retry. 

an element content tree  an array to store the list of child names  a pointer to the number of element in the list  the size of the array the number of element in the list, or -1 in case of error. 

xml-error

xml-error

xml-error

Name

xml-error —
xml-error -- 

Synopsis

Description

Details

an XML parser context  the message to display/transmit  extra parameters for the message display 

an XML parser context  the message to display/transmit  extra parameters for the message display 

an XML parser context  the message to display/transmit  extra parameters for the message display 

an XML parser context  the message to display/transmit  extra parameters for the message display 

an xmlParserInputPtr input 

an xmlParserInputPtr input 

xmlmemory

xmlmemory

xmlmemory

Name

xmlmemory —
xmlmemory -- 

Synopsis

FILE *fp); -void xmlMemShow (FILE *fp, - int nr); #define DEBUG_MEMORY_LOCATION

Description

Details

#define NO_DEBUG_MEMORY
#define NO_DEBUG_MEMORY

a pointer to the new string or NULL if allocation error occured. 

0 on success 

an int representing the amount of memory allocated. 

a FILE descriptor used as the output file, if NULL, the result is -written to the file .memorylist 

xmlMemShow ()

void        xmlMemShow                      (FILE *fp,
-                                             int nr);

show a show display of the memory allocated, and dump -the nr last allocated areas which were not freed

fp : a FILE descriptor used as the output file
nr : number of entries to dump

#define DEBUG_MEMORY_LOCATION
#define DEBUG_MEMORY_LOCATION

#define DEBUG_MEMORY
#define DEBUG_MEMORY

#define MEM_LIST /* keep a list of all the allocated memory blocks */
#define MEM_LIST

an int specifying the size in byte to allocate.  the file name or NULL - file: the line number 

the initial memory block pointer  an int specifying the size in byte to allocate.  the file name or NULL the line number

the file name or NULL the line numbera pointer to the new string or NULL if allocation error occured. 

xpath

xpath

xpath

Name

xpath —
xpath -- 

Synopsis

xmlXPathContextPtr ctxt); -xmlNodeSetPtr xmlXPathNodeSetCreate (xmlNodePtr val); -void xmlXPathFreeNodeSetList (xmlXPathObjectPtr obj); -void xmlXPathFreeNodeSet (xmlNodeSetPtr obj); ctxt);

Description

Details

#define XPATH_UNDEFINED	0
#define XPATH_UNDEFINED

#define XPATH_NODESET	1
#define XPATH_NODESET

#define XPATH_BOOLEAN	2
#define XPATH_BOOLEAN

#define XPATH_NUMBER	3
#define XPATH_NUMBER

#define XPATH_STRING	4
#define XPATH_STRING

#define XPATH_USERS	5
#define XPATH_USERS

the XML document the xmlXPathContext just allocated. 

the context to free 

the XPath expression  the XPath context the xmlXPathObjectPtr resulting from the eveluation or NULL. -the caller has to free the object. 

the object to free 

the XPath expression  the XPath context the xmlXPathObjectPtr resulting from the evaluation or NULL. -the caller has to free the object.

xmlXPathNodeSetCreate ()

xmlNodeSetPtr xmlXPathNodeSetCreate         (xmlNodePtr val);

Create a new xmlNodeSetPtr of type double and of value val

val : an initial xmlNodePtr, or NULL
Returns :the newly created object.

xmlXPathFreeNodeSetList ()

void        xmlXPathFreeNodeSetList         (xmlXPathObjectPtr obj);

Free up the xmlXPathObjectPtr obj but don't deallocate the objects in -the list contrary to xmlXPathFreeObject().

obj : an existing NodeSetList object

xmlXPathFreeNodeSet ()

void        xmlXPathFreeNodeSet             (xmlNodeSetPtr obj);

Free the NodeSet compound (not the actual nodes !).

 
obj : the xmlNodeSetPtr to free

+ @@ -38,13 +39,11 @@ - - @@ -72,15 +71,11 @@ - - - - - - + + @@ -147,19 +142,16 @@ - - - + + - - @@ -167,10 +159,6 @@ - - - - @@ -189,10 +177,8 @@ - - @@ -204,22 +190,15 @@ - - - - - - - @@ -228,7 +207,6 @@ - @@ -239,14 +217,13 @@ - + - @@ -274,7 +251,6 @@ - @@ -353,8 +329,6 @@ - - @@ -362,9 +336,6 @@ - - - @@ -388,9 +359,6 @@ - - - @@ -401,13 +369,11 @@ - - @@ -503,13 +469,12 @@ - - - - + + + @@ -517,13 +482,7 @@ - - - - - - @@ -534,7 +493,6 @@ - diff --git a/encoding.h b/encoding.h index 6a423359..5eb1a52f 100644 --- a/encoding.h +++ b/encoding.h @@ -90,12 +90,13 @@ typedef int (* xmlCharEncodingOutputFunc)(unsigned char* out, int outlen, * Block defining the handlers for non UTF-8 encodings. */ -typedef struct xmlCharEncodingHandler { +typedef struct _xmlCharEncodingHandler xmlCharEncodingHandler; +typedef xmlCharEncodingHandler *xmlCharEncodingHandlerPtr; +struct _xmlCharEncodingHandler { char *name; xmlCharEncodingInputFunc input; xmlCharEncodingOutputFunc output; -} xmlCharEncodingHandler; -typedef xmlCharEncodingHandler *xmlCharEncodingHandlerPtr; +}; void xmlInitCharEncodingHandlers (void); void xmlCleanupCharEncodingHandlers (void); diff --git a/entities.h b/entities.h index 84ad7c16..0347170e 100644 --- a/entities.h +++ b/entities.h @@ -27,7 +27,9 @@ extern "C" { * and the linkind data needed for the linking in the hash table. */ -typedef struct xmlEntity { +typedef struct _xmlEntity xmlEntity; +typedef xmlEntity *xmlEntityPtr; +struct _xmlEntity { int type; /* The entity type */ int len; /* The lenght of the name */ const xmlChar *name; /* Name of the entity */ @@ -36,8 +38,7 @@ typedef struct xmlEntity { xmlChar *content; /* The entity content or ndata if unparsed */ int length; /* the content length */ xmlChar *orig; /* The entity cont without ref substitution */ -} xmlEntity; -typedef xmlEntity *xmlEntityPtr; +}; /* * ALl entities are stored in a table there is one table per DTD @@ -46,12 +47,13 @@ typedef xmlEntity *xmlEntityPtr; #define XML_MIN_ENTITIES_TABLE 32 -typedef struct xmlEntitiesTable { +typedef struct _xmlEntitiesTable xmlEntitiesTable; +typedef xmlEntitiesTable *xmlEntitiesTablePtr; +struct _xmlEntitiesTable { int nb_entities; /* number of elements stored */ int max_entities; /* maximum number of elements */ xmlEntityPtr table; /* the table of entities */ -} xmlEntitiesTable; -typedef xmlEntitiesTable *xmlEntitiesTablePtr; +}; /* diff --git a/include/libxml/HTMLparser.h b/include/libxml/HTMLparser.h index ecb91cb2..22fe6147 100644 --- a/include/libxml/HTMLparser.h +++ b/include/libxml/HTMLparser.h @@ -30,7 +30,9 @@ typedef xmlNodePtr htmlNodePtr; /* * Internal description of an HTML element */ -typedef struct htmlElemDesc { +typedef struct _htmlElemDesc htmlElemDesc; +typedef htmlElemDesc *htmlElemDescPtr; +struct _htmlElemDesc { const char *name; /* The tag name */ int startTag; /* Whether the start tag can be implied */ int endTag; /* Whether the end tag can be implied */ @@ -38,16 +40,18 @@ typedef struct htmlElemDesc { int depr; /* Is this a deprecated element ? */ int dtd; /* 1: only in Loose DTD, 2: only Frameset one */ const char *desc; /* the description */ -} htmlElemDesc, *htmlElemDescPtr; +}; /* * Internal description of an HTML entity */ -typedef struct htmlEntityDesc { +typedef struct _htmlEntityDesc htmlEntityDesc; +typedef htmlEntityDesc *htmlEntityDescPtr; +struct _htmlEntityDesc { int value; /* the UNICODE value for the character */ const char *name; /* The entity name */ const char *desc; /* the description */ -} htmlEntityDesc, *htmlEntityDescPtr; +}; /* * There is only few public functions. diff --git a/include/libxml/debugXML.h b/include/libxml/debugXML.h index 8774f0bd..5d4d2ae1 100644 --- a/include/libxml/debugXML.h +++ b/include/libxml/debugXML.h @@ -64,7 +64,9 @@ typedef char * (* xmlShellReadlineFunc)(char *prompt); * The shell context itself * TODO: add the defined function tables. */ -typedef struct xmlShellCtxt { +typedef struct _xmlShellCtxt xmlShellCtxt; +typedef xmlShellCtxt *xmlShellCtxtPtr; +struct _xmlShellCtxt { char *filename; xmlDocPtr doc; xmlNodePtr node; @@ -72,7 +74,7 @@ typedef struct xmlShellCtxt { int loaded; FILE *output; xmlShellReadlineFunc input; -} xmlShellCtxt, *xmlShellCtxtPtr; +}; /** * xmlShellCmd: diff --git a/include/libxml/encoding.h b/include/libxml/encoding.h index 6a423359..5eb1a52f 100644 --- a/include/libxml/encoding.h +++ b/include/libxml/encoding.h @@ -90,12 +90,13 @@ typedef int (* xmlCharEncodingOutputFunc)(unsigned char* out, int outlen, * Block defining the handlers for non UTF-8 encodings. */ -typedef struct xmlCharEncodingHandler { +typedef struct _xmlCharEncodingHandler xmlCharEncodingHandler; +typedef xmlCharEncodingHandler *xmlCharEncodingHandlerPtr; +struct _xmlCharEncodingHandler { char *name; xmlCharEncodingInputFunc input; xmlCharEncodingOutputFunc output; -} xmlCharEncodingHandler; -typedef xmlCharEncodingHandler *xmlCharEncodingHandlerPtr; +}; void xmlInitCharEncodingHandlers (void); void xmlCleanupCharEncodingHandlers (void); diff --git a/include/libxml/entities.h b/include/libxml/entities.h index 84ad7c16..0347170e 100644 --- a/include/libxml/entities.h +++ b/include/libxml/entities.h @@ -27,7 +27,9 @@ extern "C" { * and the linkind data needed for the linking in the hash table. */ -typedef struct xmlEntity { +typedef struct _xmlEntity xmlEntity; +typedef xmlEntity *xmlEntityPtr; +struct _xmlEntity { int type; /* The entity type */ int len; /* The lenght of the name */ const xmlChar *name; /* Name of the entity */ @@ -36,8 +38,7 @@ typedef struct xmlEntity { xmlChar *content; /* The entity content or ndata if unparsed */ int length; /* the content length */ xmlChar *orig; /* The entity cont without ref substitution */ -} xmlEntity; -typedef xmlEntity *xmlEntityPtr; +}; /* * ALl entities are stored in a table there is one table per DTD @@ -46,12 +47,13 @@ typedef xmlEntity *xmlEntityPtr; #define XML_MIN_ENTITIES_TABLE 32 -typedef struct xmlEntitiesTable { +typedef struct _xmlEntitiesTable xmlEntitiesTable; +typedef xmlEntitiesTable *xmlEntitiesTablePtr; +struct _xmlEntitiesTable { int nb_entities; /* number of elements stored */ int max_entities; /* maximum number of elements */ xmlEntityPtr table; /* the table of entities */ -} xmlEntitiesTable; -typedef xmlEntitiesTable *xmlEntitiesTablePtr; +}; /* diff --git a/include/libxml/parser.h b/include/libxml/parser.h index 938ea8cb..e02751ca 100644 --- a/include/libxml/parser.h +++ b/include/libxml/parser.h @@ -34,7 +34,9 @@ extern "C" { */ typedef void (* xmlParserInputDeallocate)(xmlChar *); -typedef struct xmlParserInput { +typedef struct _xmlParserInput xmlParserInput; +typedef xmlParserInput *xmlParserInputPtr; +struct _xmlParserInput { /* Input buffer */ xmlParserInputBufferPtr buf; /* UTF-8 encoded buffer */ @@ -47,35 +49,36 @@ typedef struct xmlParserInput { int col; /* Current column */ int consumed; /* How many xmlChars already consumed */ xmlParserInputDeallocate free; /* function to deallocate the base */ -} xmlParserInput; -typedef xmlParserInput *xmlParserInputPtr; +}; /** * the parser can be asked to collect Node informations, i.e. at what * place in the file they were detected. * NOTE: This is off by default and not very well tested. */ -typedef struct _xmlParserNodeInfo { - const struct xmlNode* node; +typedef struct _xmlParserNodeInfo xmlParserNodeInfo; +typedef xmlParserNodeInfo *xmlParserNodeInfoPtr; + +struct _xmlParserNodeInfo { + const struct _xmlNode* node; /* Position & line # that text that created the node begins & ends on */ unsigned long begin_pos; unsigned long begin_line; unsigned long end_pos; unsigned long end_line; -} _xmlParserNodeInfo; -typedef _xmlParserNodeInfo xmlParserNodeInfo; +}; -typedef struct xmlParserNodeInfoSeq { +typedef struct _xmlParserNodeInfoSeq xmlParserNodeInfoSeq; +typedef xmlParserNodeInfoSeq *xmlParserNodeInfoSeqPtr; +struct _xmlParserNodeInfoSeq { unsigned long maximum; unsigned long length; xmlParserNodeInfo* buffer; -} _xmlParserNodeInfoSeq; -typedef _xmlParserNodeInfoSeq xmlParserNodeInfoSeq; -typedef xmlParserNodeInfoSeq *xmlParserNodeInfoSeqPtr; +}; /** - * The parser is not (yet) a state based parser, but we need to maintain - * minimum state informations, especially for entities processing. + * The parser is now working also as a state based parser + * The recursive one use the stagte info for entities processing */ typedef enum { XML_PARSER_EOF = -1, /* nothing is to be parsed */ @@ -105,8 +108,10 @@ typedef enum { * takes as the only argument the parser context pointer, so migrating * to a state based parser for progressive parsing shouldn't be too hard. */ -typedef struct _xmlParserCtxt { - struct xmlSAXHandler *sax; /* The SAX handler */ +typedef struct _xmlParserCtxt xmlParserCtxt; +typedef xmlParserCtxt *xmlParserCtxtPtr; +struct _xmlParserCtxt { + struct _xmlSAXHandler *sax; /* The SAX handler */ void *userData; /* the document being built */ xmlDocPtr myDoc; /* the document being built */ int wellFormed; /* is the document well formed */ @@ -154,21 +159,19 @@ typedef struct _xmlParserCtxt { long nbChars; /* number of xmlChar processed */ long checkIndex; /* used by progressive parsing lookup */ -} _xmlParserCtxt; -typedef _xmlParserCtxt xmlParserCtxt; -typedef xmlParserCtxt *xmlParserCtxtPtr; +}; /** * a SAX Locator. */ -typedef struct xmlSAXLocator { +typedef struct _xmlSAXLocator xmlSAXLocator; +typedef xmlSAXLocator *xmlSAXLocatorPtr; +struct _xmlSAXLocator { const xmlChar *(*getPublicId)(void *ctx); const xmlChar *(*getSystemId)(void *ctx); int (*getLineNumber)(void *ctx); int (*getColumnNumber)(void *ctx); -} _xmlSAXLocator; -typedef _xmlSAXLocator xmlSAXLocator; -typedef xmlSAXLocator *xmlSAXLocatorPtr; +}; /** * a SAX handler is bunch of callbacks called by the parser when processing @@ -221,7 +224,9 @@ typedef int (*isStandaloneSAXFunc) (void *ctx); typedef int (*hasInternalSubsetSAXFunc) (void *ctx); typedef int (*hasExternalSubsetSAXFunc) (void *ctx); -typedef struct xmlSAXHandler { +typedef struct _xmlSAXHandler xmlSAXHandler; +typedef xmlSAXHandler *xmlSAXHandlerPtr; +struct _xmlSAXHandler { internalSubsetSAXFunc internalSubset; isStandaloneSAXFunc isStandalone; hasInternalSubsetSAXFunc hasInternalSubset; @@ -248,8 +253,7 @@ typedef struct xmlSAXHandler { fatalErrorSAXFunc fatalError; getParameterEntitySAXFunc getParameterEntity; cdataBlockSAXFunc cdataBlock; -} xmlSAXHandler; -typedef xmlSAXHandler *xmlSAXHandlerPtr; +}; /** * External entity loaders types diff --git a/include/libxml/tree.h b/include/libxml/tree.h index 0ff3a51c..13469942 100644 --- a/include/libxml/tree.h +++ b/include/libxml/tree.h @@ -67,12 +67,13 @@ typedef unsigned char xmlChar; * a DTD Notation definition */ -typedef struct xmlNotation { +typedef struct _xmlNotation xmlNotation; +typedef xmlNotation *xmlNotationPtr; +struct _xmlNotation { const xmlChar *name; /* Notation name */ const xmlChar *PublicID; /* Public identifier, if any */ const xmlChar *SystemID; /* System identifier, if any */ -} xmlNotation; -typedef xmlNotation *xmlNotationPtr; +}; /* * a DTD Attribute definition @@ -98,23 +99,25 @@ typedef enum { XML_ATTRIBUTE_FIXED } xmlAttributeDefault; -typedef struct xmlEnumeration { - struct xmlEnumeration *next; /* next one */ - const xmlChar *name; /* Enumeration name */ -} xmlEnumeration; +typedef struct _xmlEnumeration xmlEnumeration; typedef xmlEnumeration *xmlEnumerationPtr; +struct _xmlEnumeration { + struct _xmlEnumeration *next; /* next one */ + const xmlChar *name; /* Enumeration name */ +}; -typedef struct xmlAttribute { +typedef struct _xmlAttribute xmlAttribute; +typedef xmlAttribute *xmlAttributePtr; +struct _xmlAttribute { const xmlChar *elem; /* Element holding the attribute */ const xmlChar *name; /* Attribute name */ - struct xmlAttribute *next; /* list of attributes of an element */ + struct _xmlAttribute *next; /* list of attributes of an element */ xmlAttributeType type; /* The type */ xmlAttributeDefault def; /* the default */ const xmlChar *defaultValue;/* or the default value */ xmlEnumerationPtr tree; /* or the enumeration tree if any */ const xmlChar *prefix; /* the namespace prefix if any */ -} xmlAttribute; -typedef xmlAttribute *xmlAttributePtr; +}; /* * a DTD Element definition. @@ -133,14 +136,15 @@ typedef enum { XML_ELEMENT_CONTENT_PLUS } xmlElementContentOccur; -typedef struct xmlElementContent { +typedef struct _xmlElementContent xmlElementContent; +typedef xmlElementContent *xmlElementContentPtr; +struct _xmlElementContent { xmlElementContentType type; /* PCDATA, ELEMENT, SEQ or OR */ xmlElementContentOccur ocur; /* ONCE, OPT, MULT or PLUS */ const xmlChar *name; /* Element name */ - struct xmlElementContent *c1; /* first child */ - struct xmlElementContent *c2; /* second child */ -} xmlElementContent; -typedef xmlElementContent *xmlElementContentPtr; + struct _xmlElementContent *c1; /* first child */ + struct _xmlElementContent *c2; /* second child */ +}; typedef enum { XML_ELEMENT_TYPE_EMPTY = 1, @@ -149,13 +153,14 @@ typedef enum { XML_ELEMENT_TYPE_ELEMENT } xmlElementTypeVal; -typedef struct xmlElement { +typedef struct _xmlElement xmlElement; +typedef xmlElement *xmlElementPtr; +struct _xmlElement { const xmlChar *name; /* Element name */ xmlElementTypeVal type; /* The type */ xmlElementContentPtr content; /* the allowed element content */ xmlAttributePtr attributes; /* List of the declared attributes */ -} xmlElement; -typedef xmlElement *xmlElementPtr; +}; /* * An XML namespace. @@ -168,18 +173,21 @@ typedef enum { XML_LOCAL_NAMESPACE /* new style local scoping */ } xmlNsType; -typedef struct xmlNs { - struct xmlNs *next; /* next Ns link for this node */ +typedef struct _xmlNs xmlNs; +typedef xmlNs *xmlNsPtr; +struct _xmlNs { + struct _xmlNs *next; /* next Ns link for this node */ xmlNsType type; /* global or local */ const xmlChar *href; /* URL for the namespace */ const xmlChar *prefix; /* prefix for the namespace */ -} xmlNs; -typedef xmlNs *xmlNsPtr; +}; /* * An XML DtD, as defined by node link */ - struct xmlAttr *next; /* attribute list link */ - const xmlChar *name; /* the name of the property */ - struct xmlNode *val; /* the value of the property */ - xmlNs *ns; /* pointer to the associated namespace */ -} xmlAttr; -typedef xmlAttr *xmlAttrPtr; + struct _xmlNode *node; /* attr->node link */ + struct _xmlAttr *next; /* attribute list link */ + const xmlChar *name; /* the name of the property */ + struct _xmlNode *val; /* the value of the property */ + xmlNs *ns; /* pointer to the associated namespace */ +}; /* * An XML ID instance. */ -typedef struct xmlID { - struct xmlID *next; /* next ID */ +typedef struct _xmlID xmlID; +typedef xmlID *xmlIDPtr; +struct _xmlID { + struct _xmlID *next; /* next ID */ const xmlChar *value; /* The ID name */ xmlAttrPtr attr; /* The attribut holding it */ -} xmlID; -typedef xmlID *xmlIDPtr; +}; /* * An XML IDREF instance. */ -typedef struct xmlRef { - struct xmlRef *next; /* next Ref */ +typedef struct _xmlRef xmlRef; +typedef xmlRef *xmlRefPtr; +struct _xmlRef { + struct _xmlRef *next; /* next Ref */ const xmlChar *value; /* The Ref name */ xmlAttrPtr attr; /* The attribut holding it */ -} xmlRef; -typedef xmlRef *xmlRefPtr; +}; /* * A buffer structure @@ -239,31 +249,33 @@ typedef enum { XML_BUFFER_ALLOC_EXACT } xmlBufferAllocationScheme; -typedef struct xmlBuffer { +typedef struct _xmlBuffer xmlBuffer; +typedef xmlBuffer *xmlBufferPtr; +struct _xmlBuffer { xmlChar *content; /* The buffer content UTF8 */ unsigned int use; /* The buffer size used */ unsigned int size; /* The buffer size */ xmlBufferAllocationScheme alloc; /* The realloc method */ -} _xmlBuffer; -typedef _xmlBuffer xmlBuffer; -typedef xmlBuffer *xmlBufferPtr; +}; /* * A node in an XML tree. */ -typedef struct xmlNode { +typedef struct _xmlNode xmlNode; +typedef xmlNode *xmlNodePtr; +struct _xmlNode { #ifndef XML_WITHOUT_CORBA void *_private; /* for Corba, must be first ! */ void *vepv; /* for Corba, must be next ! */ #endif xmlElementType type; /* type number in the DTD, must be third ! */ - struct xmlDoc *doc; /* the containing document */ - struct xmlNode *parent; /* child->parent link */ - struct xmlNode *next; /* next sibling link */ - struct xmlNode *prev; /* previous sibling link */ - struct xmlNode *childs; /* parent->childs link */ - struct xmlNode *last; /* last child link */ - struct xmlAttr *properties; /* properties list */ + struct _xmlDoc *doc; /* the containing document */ + struct _xmlNode *parent; /* child->parent link */ + struct _xmlNode *next; /* next sibling link */ + struct _xmlNode *prev; /* previous sibling link */ + struct _xmlNode *childs; /* parent->childs link */ + struct _xmlNode *last; /* last child link */ + struct _xmlAttr *properties;/* properties list */ const xmlChar *name; /* the name of the node, or the entity */ xmlNs *ns; /* pointer to the associated namespace */ xmlNs *nsDef; /* namespace definitions on this node */ @@ -272,14 +284,14 @@ typedef struct xmlNode { #else xmlBufferPtr content; /* the content in a buffer */ #endif -} _xmlNode; -typedef _xmlNode xmlNode; -typedef _xmlNode *xmlNodePtr; +}; /* * An XML document. */ -typedef struct xmlDoc { +typedef struct _xmlDoc xmlDoc; +typedef xmlDoc *xmlDocPtr; +struct _xmlDoc { #ifndef XML_WITHOUT_CORBA void *_private; /* for Corba, must be first ! */ void *vepv; /* for Corba, must be next ! */ @@ -290,15 +302,13 @@ typedef struct xmlDoc { const xmlChar *encoding; /* encoding, if any */ int compression;/* level of zlib compression */ int standalone; /* standalone document (no external refs) */ - struct xmlDtd *intSubset; /* the document internal subset */ - struct xmlDtd *extSubset; /* the document external subset */ - struct xmlNs *oldNs; /* Global namespace, the old way */ - struct xmlNode *root; /* the document tree */ + struct _xmlDtd *intSubset; /* the document internal subset */ + struct _xmlDtd *extSubset; /* the document external subset */ + struct _xmlNs *oldNs; /* Global namespace, the old way */ + struct _xmlNode *root; /* the document tree */ void *ids; /* Hash table for ID attributes if any */ void *refs; /* Hash table for IDREFs attributes if any */ -} _xmlDoc; -typedef _xmlDoc xmlDoc; -typedef xmlDoc *xmlDocPtr; +}; /* * Variables. diff --git a/include/libxml/valid.h b/include/libxml/valid.h index 7190bbfa..8c86b17b 100644 --- a/include/libxml/valid.h +++ b/include/libxml/valid.h @@ -23,11 +23,13 @@ extern "C" { typedef void (*xmlValidityErrorFunc) (void *ctx, const char *msg, ...); typedef void (*xmlValidityWarningFunc) (void *ctx, const char *msg, ...); -typedef struct xmlValidCtxt { +typedef struct _xmlValidCtxt xmlValidCtxt; +typedef xmlValidCtxt *xmlValidCtxtPtr; +struct _xmlValidCtxt { void *userData; /* user specific data block */ xmlValidityErrorFunc error; /* the callback in case of errors */ xmlValidityWarningFunc warning; /* the callback in case of warning */ -} xmlValidCtxt, *xmlValidCtxtPtr; +}; /* * ALl notation declarations are stored in a table @@ -36,12 +38,13 @@ typedef struct xmlValidCtxt { #define XML_MIN_NOTATION_TABLE 32 -typedef struct xmlNotationTable { +typedef struct _xmlNotationTable xmlNotationTable; +typedef xmlNotationTable *xmlNotationTablePtr; +struct _xmlNotationTable { int nb_notations; /* number of notations stored */ int max_notations; /* maximum number of notations */ xmlNotationPtr *table; /* the table of attributes */ -} xmlNotationTable; -typedef xmlNotationTable *xmlNotationTablePtr; +}; /* * ALl element declarations are stored in a table @@ -50,12 +53,13 @@ typedef xmlNotationTable *xmlNotationTablePtr; #define XML_MIN_ELEMENT_TABLE 32 -typedef struct xmlElementTable { +typedef struct _xmlElementTable xmlElementTable; +typedef xmlElementTable *xmlElementTablePtr; +struct _xmlElementTable { int nb_elements; /* number of elements stored */ int max_elements; /* maximum number of elements */ xmlElementPtr *table; /* the table of elements */ -} xmlElementTable; -typedef xmlElementTable *xmlElementTablePtr; +}; /* * ALl attribute declarations are stored in a table @@ -64,12 +68,13 @@ typedef xmlElementTable *xmlElementTablePtr; #define XML_MIN_ATTRIBUTE_TABLE 32 -typedef struct xmlAttributeTable { +typedef struct _xmlAttributeTable xmlAttributeTable; +typedef xmlAttributeTable *xmlAttributeTablePtr; +struct _xmlAttributeTable { int nb_attributes; /* number of attributes stored */ int max_attributes; /* maximum number of attributes */ xmlAttributePtr *table; /* the table of attributes */ -} xmlAttributeTable; -typedef xmlAttributeTable *xmlAttributeTablePtr; +}; /* * ALl IDs attributes are stored in a table @@ -78,12 +83,13 @@ typedef xmlAttributeTable *xmlAttributeTablePtr; #define XML_MIN_ID_TABLE 32 -typedef struct xmlIDTable { +typedef struct _xmlIDTable xmlIDTable; +typedef xmlIDTable *xmlIDTablePtr; +struct _xmlIDTable { int nb_ids; /* number of ids stored */ int max_ids; /* maximum number of ids */ xmlIDPtr *table; /* the table of ids */ -} xmlIDTable; -typedef xmlIDTable *xmlIDTablePtr; +}; /* * ALl Refs attributes are stored in a table @@ -92,12 +98,13 @@ typedef xmlIDTable *xmlIDTablePtr; #define XML_MIN_REF_TABLE 32 -typedef struct xmlRefTable { +typedef struct _xmlRefTable xmlRefTable; +typedef xmlRefTable *xmlRefTablePtr; +struct _xmlRefTable { int nb_refs; /* number of refs stored */ int max_refs; /* maximum number of refs */ xmlRefPtr *table; /* the table of refs */ -} xmlRefTable; -typedef xmlRefTable *xmlRefTablePtr; +}; /* Notation */ xmlNotationPtr xmlAddNotationDecl (xmlValidCtxtPtr ctxt, @@ -158,6 +165,7 @@ xmlAttrPtr xmlGetID (xmlDocPtr doc, int xmlIsID (xmlDocPtr doc, xmlNodePtr elem, xmlAttrPtr attr); +int xmlRemoveID (xmlDocPtr doc, xmlAttrPtr attr); /* IDREFs */ xmlRefPtr xmlAddRef (xmlValidCtxtPtr ctxt, @@ -169,6 +177,7 @@ void xmlFreeRefTable (xmlRefTablePtr table); int xmlIsRef (xmlDocPtr doc, xmlNodePtr elem, xmlAttrPtr attr); +int xmlRemoveRef (xmlDocPtr doc, xmlAttrPtr attr); /** * The public function calls related to validity checking diff --git a/include/libxml/xlink.h b/include/libxml/xlink.h index 15331481..0bcceeb8 100644 --- a/include/libxml/xlink.h +++ b/include/libxml/xlink.h @@ -148,12 +148,13 @@ typedef void * There is no default xlink callbacks, if one want to get link * recognition activated, those call backs must be provided before parsing. */ -typedef struct xlinkHandler { +typedef struct _xlinkHandler xlinkHandler; +typedef xlinkHandler *xlinkHandlerPtr; +struct _xlinkHandler { xlinkSimpleLinkFunk simple; xlinkExtendedLinkFunk extended; xlinkExtendedLinkSetFunk set; -} xlinkHandler; -typedef xlinkHandler *xlinkHandlerPtr; +}; /** * the default detection routine, can be overriden, they call the default diff --git a/include/libxml/xmlIO.h b/include/libxml/xmlIO.h index bf43de25..48bbcbb9 100644 --- a/include/libxml/xmlIO.h +++ b/include/libxml/xmlIO.h @@ -18,7 +18,9 @@ extern "C" { #endif -typedef struct xmlParserInputBuffer { +typedef struct _xmlParserInputBuffer xmlParserInputBuffer; +typedef xmlParserInputBuffer *xmlParserInputBufferPtr; +struct _xmlParserInputBuffer { /* Inputs */ FILE *file; /* Input on file handler */ void* gzfile; /* Input on a compressed stream */ @@ -29,9 +31,8 @@ typedef struct xmlParserInputBuffer { xmlBufferPtr buffer; /* Local buffer encoded in UTF-8 */ -} xmlParserInputBuffer; +}; -typedef xmlParserInputBuffer *xmlParserInputBufferPtr; /* * Interfaces diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h index 84c83052..c0222e6e 100644 --- a/include/libxml/xpath.h +++ b/include/libxml/xpath.h @@ -18,16 +18,21 @@ extern "C" { #endif -typedef struct xmlXPathParserContext *xmlXPathParserContextPtr; +typedef struct _xmlXPathContext xmlXPathContext; +typedef xmlXPathContext *xmlXPathContextPtr; +typedef struct _xmlXPathParserContext xmlXPathParserContext; +typedef xmlXPathParserContext *xmlXPathParserContextPtr; /* * A node-set (an unordered collection of nodes without duplicates) */ -typedef struct xmlNodeSet { +typedef struct _xmlNodeSet xmlNodeSet; +typedef xmlNodeSet *xmlNodeSetPtr; +struct _xmlNodeSet { int nodeNr; /* # of node in the set */ int nodeMax; /* allocated space */ xmlNodePtr *nodeTab; /* array of nodes in no particular order */ -} xmlNodeSet, *xmlNodeSetPtr; +}; /* * An expression is evaluated to yield an object, which @@ -45,14 +50,16 @@ typedef struct xmlNodeSet { #define XPATH_STRING 4 #define XPATH_USERS 5 -typedef struct xmlXPathObject { +typedef struct _xmlXPathObject xmlXPathObject; +typedef xmlXPathObject *xmlXPathObjectPtr; +struct _xmlXPathObject { int type; xmlNodeSetPtr nodesetval; int boolval; double floatval; xmlChar *stringval; void *user; -} xmlXPathObject, *xmlXPathObjectPtr; +}; /* * A conversion function is associated to a type and used to cast @@ -64,19 +71,23 @@ typedef int (*xmlXPathConvertFunc) (xmlXPathObjectPtr obj, int type); * Extra type: a name and a conversion function. */ -typedef struct xmlXPathType { +typedef struct _xmlXPathType xmlXPathType; +typedef xmlXPathType *xmlXPathTypePtr; +struct _xmlXPathType { const xmlChar *name; /* the type name */ xmlXPathConvertFunc func; /* the conversion function */ -} xmlXPathType, *xmlXPathTypePtr; +}; /* * Extra variable: a name and a value. */ -typedef struct xmlXPathVariable { +typedef struct _xmlXPathVariable xmlXPathVariable; +typedef xmlXPathVariable *xmlXPathVariablePtr; +struct _xmlXPathVariable { const xmlChar *name; /* the variable name */ xmlXPathObjectPtr value; /* the value */ -} xmlXPathVariable, *xmlXPathVariablePtr; +}; /* * an evaluation function, the parameters are on the context stack @@ -88,10 +99,12 @@ typedef void (*xmlXPathEvalFunc)(xmlXPathParserContextPtr ctxt, int nargs); * Extra function: a name and a evaluation function. */ -typedef struct xmlXPathFunct { +typedef struct _xmlXPathFunct xmlXPathFunct; +typedef xmlXPathFunct *xmlXPathFuncPtr; +struct _xmlXPathFunct { const xmlChar *name; /* the function name */ xmlXPathEvalFunc func; /* the evaluation function */ -} xmlXPathFunc, *xmlXPathFuncPtr; +}; /* * An axis traversal function. To traverse an axis, the engine calls @@ -106,10 +119,12 @@ typedef xmlXPathObjectPtr (*xmlXPathAxisFunc) (xmlXPathParserContextPtr ctxt, * Extra axis: a name and an axis function. */ -typedef struct xmlXPathAxis { +typedef struct _xmlXPathAxis xmlXPathAxis; +typedef xmlXPathAxis *xmlXPathAxisPtr; +struct _xmlXPathAxis { const xmlChar *name; /* the axis name */ xmlXPathAxisFunc func; /* the search function */ -} xmlXPathAxis, *xmlXPathAxisPtr; +}; /* * Expression evaluation occurs with respect to a context. @@ -121,7 +136,7 @@ typedef struct xmlXPathAxis { * - the set of namespace declarations in scope for the expression */ -typedef struct xmlXPathContext { +struct _xmlXPathContext { xmlDocPtr doc; /* The current document */ xmlNodePtr node; /* The current node */ xmlNodeSetPtr nodelist; /* The current node list */ @@ -146,13 +161,13 @@ typedef struct xmlXPathContext { xmlNsPtr *namespaces; /* The namespaces lookup */ int nsNr; /* the current Namespace index */ void *user; /* user defined extra info */ -} xmlXPathContext, *xmlXPathContextPtr; +}; /* * An XPath parser context, it contains pure parsing informations, * an xmlXPathContext, and the stack of objects. */ -typedef struct xmlXPathParserContext { +struct _xmlXPathParserContext { const xmlChar *cur; /* the current char being parsed */ const xmlChar *base; /* the full expression */ @@ -163,7 +178,7 @@ typedef struct xmlXPathParserContext { int valueNr; /* number of values stacked */ int valueMax; /* max number of values stacked */ xmlXPathObjectPtr *valueTab; /* stack of values */ -} xmlXPathParserContext; +}; /* * An XPath function diff --git a/parser.c b/parser.c index a344ad10..a861deb2 100644 --- a/parser.c +++ b/parser.c @@ -4832,14 +4832,29 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) { /* * Skip up to the end of the conditionnal section. */ - while ((CUR != 0) && ((CUR != ']') || (NXT(1) != ']') || (NXT(2) != '>'))) + while ((CUR != 0) && ((CUR != ']') || (NXT(1) != ']') || (NXT(2) != '>'))) { NEXT; + /* + * Pop-up of finished entities. + */ + while ((CUR == 0) && (ctxt->inputNr > 1)) + xmlPopInput(ctxt); + + if (CUR == 0) + GROW; + } + + if (CUR == 0) + SHRINK; + if (CUR == 0) { if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) ctxt->sax->error(ctxt->userData, "XML conditional section not closed\n"); ctxt->errNo = XML_ERR_CONDSEC_NOT_FINISHED; ctxt->wellFormed = 0; + } else { + SKIP(3); } } @@ -7013,15 +7028,16 @@ xmlParseLookupSequence(xmlParserCtxtPtr ctxt, xmlChar first, } /** - * xmlParseTry: + * xmlParseTryOrFinish: * @ctxt: an XML parser context + * @terminate: last chunk indicator * * Try to progress on parsing * * Returns zero if no parsing was possible */ int -xmlParseTry(xmlParserCtxtPtr ctxt) { +xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) { int ret = 0; xmlParserInputPtr in; int avail; @@ -7128,7 +7144,8 @@ xmlParseTry(xmlParserCtxtPtr ctxt) { if ((cur == '<') && (next == '?')) { /* PI or XML decl */ if (avail < 5) return(ret); - if (xmlParseLookupSequence(ctxt, '?', '>', 0) < 0) + if ((!terminate) && + (xmlParseLookupSequence(ctxt, '?', '>', 0) < 0)) return(ret); if ((ctxt->sax) && (ctxt->sax->setDocumentLocator)) ctxt->sax->setDocumentLocator(ctxt->userData, @@ -7181,7 +7198,8 @@ xmlParseTry(xmlParserCtxtPtr ctxt) { cur = in->cur[0]; next = in->cur[1]; if ((cur == '<') && (next == '?')) { - if (xmlParseLookupSequence(ctxt, '?', '>', 0) < 0) + if ((!terminate) && + (xmlParseLookupSequence(ctxt, '?', '>', 0) < 0)) goto done; #ifdef DEBUG_PUSH fprintf(stderr, "PP: Parsing PI\n"); @@ -7189,7 +7207,8 @@ xmlParseTry(xmlParserCtxtPtr ctxt) { xmlParsePI(ctxt); } else if ((cur == '<') && (next == '!') && (in->cur[2] == '-') && (in->cur[3] == '-')) { - if (xmlParseLookupSequence(ctxt, '-', '-', '>') < 0) + if ((!terminate) && + (xmlParseLookupSequence(ctxt, '-', '-', '>') < 0)) goto done; #ifdef DEBUG_PUSH fprintf(stderr, "PP: Parsing Comment\n"); @@ -7201,7 +7220,8 @@ xmlParseTry(xmlParserCtxtPtr ctxt) { (in->cur[4] == 'C') && (in->cur[5] == 'T') && (in->cur[6] == 'Y') && (in->cur[7] == 'P') && (in->cur[8] == 'E')) { - if (xmlParseLookupSequence(ctxt, '>', 0, 0) < 0) + if ((!terminate) && + (xmlParseLookupSequence(ctxt, '>', 0, 0) < 0)) goto done; #ifdef DEBUG_PUSH fprintf(stderr, "PP: Parsing internal subset\n"); @@ -7239,7 +7259,8 @@ xmlParseTry(xmlParserCtxtPtr ctxt) { cur = in->cur[0]; next = in->cur[1]; if ((cur == '<') && (next == '?')) { - if (xmlParseLookupSequence(ctxt, '?', '>', 0) < 0) + if ((!terminate) && + (xmlParseLookupSequence(ctxt, '?', '>', 0) < 0)) goto done; #ifdef DEBUG_PUSH fprintf(stderr, "PP: Parsing PI\n"); @@ -7247,7 +7268,8 @@ xmlParseTry(xmlParserCtxtPtr ctxt) { xmlParsePI(ctxt); } else if ((cur == '<') && (next == '!') && (in->cur[2] == '-') && (in->cur[3] == '-')) { - if (xmlParseLookupSequence(ctxt, '-', '-', '>') < 0) + if ((!terminate) && + (xmlParseLookupSequence(ctxt, '-', '-', '>') < 0)) goto done; #ifdef DEBUG_PUSH fprintf(stderr, "PP: Parsing Comment\n"); @@ -7275,7 +7297,8 @@ xmlParseTry(xmlParserCtxtPtr ctxt) { cur = in->cur[0]; next = in->cur[1]; if ((cur == '<') && (next == '?')) { - if (xmlParseLookupSequence(ctxt, '?', '>', 0) < 0) + if ((!terminate) && + (xmlParseLookupSequence(ctxt, '?', '>', 0) < 0)) goto done; #ifdef DEBUG_PUSH fprintf(stderr, "PP: Parsing PI\n"); @@ -7284,7 +7307,8 @@ xmlParseTry(xmlParserCtxtPtr ctxt) { ctxt->instate = XML_PARSER_EPILOG; } else if ((cur == '<') && (next == '!') && (in->cur[2] == '-') && (in->cur[3] == '-')) { - if (xmlParseLookupSequence(ctxt, '-', '-', '>') < 0) + if ((!terminate) && + (xmlParseLookupSequence(ctxt, '-', '-', '>') < 0)) goto done; #ifdef DEBUG_PUSH fprintf(stderr, "PP: Parsing Comment\n"); @@ -7329,7 +7353,8 @@ xmlParseTry(xmlParserCtxtPtr ctxt) { ctxt->sax->endDocument(ctxt->userData); goto done; } - if (xmlParseLookupSequence(ctxt, '>', 0, 0) < 0) + if ((!terminate) && + (xmlParseLookupSequence(ctxt, '>', 0, 0) < 0)) goto done; name = xmlParseStartTag(ctxt); if (name == NULL) { @@ -7426,7 +7451,8 @@ xmlParseTry(xmlParserCtxtPtr ctxt) { cur = in->cur[0]; next = in->cur[1]; if ((cur == '<') && (next == '?')) { - if (xmlParseLookupSequence(ctxt, '?', '>', 0) < 0) + if ((!terminate) && + (xmlParseLookupSequence(ctxt, '?', '>', 0) < 0)) goto done; #ifdef DEBUG_PUSH fprintf(stderr, "PP: Parsing PI\n"); @@ -7434,7 +7460,8 @@ xmlParseTry(xmlParserCtxtPtr ctxt) { xmlParsePI(ctxt); } else if ((cur == '<') && (next == '!') && (in->cur[2] == '-') && (in->cur[3] == '-')) { - if (xmlParseLookupSequence(ctxt, '-', '-', '>') < 0) + if ((!terminate) && + (xmlParseLookupSequence(ctxt, '-', '-', '>') < 0)) goto done; #ifdef DEBUG_PUSH fprintf(stderr, "PP: Parsing Comment\n"); @@ -7468,7 +7495,8 @@ xmlParseTry(xmlParserCtxtPtr ctxt) { #endif break; } else if (cur == '&') { - if (xmlParseLookupSequence(ctxt, ';', 0, 0) < 0) + if ((!terminate) && + (xmlParseLookupSequence(ctxt, ';', 0, 0) < 0)) goto done; #ifdef DEBUG_PUSH fprintf(stderr, "PP: Parsing Reference\n"); @@ -7490,7 +7518,8 @@ xmlParseTry(xmlParserCtxtPtr ctxt) { */ if ((ctxt->inputNr == 1) && (avail < XML_PARSER_BIG_BUFFER_SIZE)) { - if (xmlParseLookupSequence(ctxt, '<', 0, 0) < 0) + if ((!terminate) && + (xmlParseLookupSequence(ctxt, '<', 0, 0) < 0)) goto done; } ctxt->checkIndex = 0; @@ -7543,7 +7572,8 @@ xmlParseTry(xmlParserCtxtPtr ctxt) { case XML_PARSER_END_TAG: if (avail < 2) goto done; - if (xmlParseLookupSequence(ctxt, '>', 0, 0) < 0) + if ((!terminate) && + (xmlParseLookupSequence(ctxt, '>', 0, 0) < 0)) goto done; xmlParseEndTag(ctxt); if (ctxt->name == NULL) { @@ -7671,6 +7701,19 @@ done: return(ret); } +/** + * xmlParseTry: + * @ctxt: an XML parser context + * + * Try to progress on parsing + * + * Returns zero if no parsing was possible + */ +int +xmlParseTry(xmlParserCtxtPtr ctxt) { + return(xmlParseTryOrFinish(ctxt, 0)); +} + /** * xmlParseChunk: * @ctxt: an XML parser context @@ -7697,9 +7740,9 @@ xmlParseChunk(xmlParserCtxtPtr ctxt, const char *chunk, int size, fprintf(stderr, "PP: pushed %d\n", size); #endif - xmlParseTry(ctxt); + xmlParseTryOrFinish(ctxt, terminate); } else if (ctxt->instate != XML_PARSER_EOF) - xmlParseTry(ctxt); + xmlParseTryOrFinish(ctxt, terminate); if (terminate) { if ((ctxt->instate != XML_PARSER_EOF) && (ctxt->instate != XML_PARSER_EPILOG)) { diff --git a/parser.h b/parser.h index 938ea8cb..e02751ca 100644 --- a/parser.h +++ b/parser.h @@ -34,7 +34,9 @@ extern "C" { */ typedef void (* xmlParserInputDeallocate)(xmlChar *); -typedef struct xmlParserInput { +typedef struct _xmlParserInput xmlParserInput; +typedef xmlParserInput *xmlParserInputPtr; +struct _xmlParserInput { /* Input buffer */ xmlParserInputBufferPtr buf; /* UTF-8 encoded buffer */ @@ -47,35 +49,36 @@ typedef struct xmlParserInput { int col; /* Current column */ int consumed; /* How many xmlChars already consumed */ xmlParserInputDeallocate free; /* function to deallocate the base */ -} xmlParserInput; -typedef xmlParserInput *xmlParserInputPtr; +}; /** * the parser can be asked to collect Node informations, i.e. at what * place in the file they were detected. * NOTE: This is off by default and not very well tested. */ -typedef struct _xmlParserNodeInfo { - const struct xmlNode* node; +typedef struct _xmlParserNodeInfo xmlParserNodeInfo; +typedef xmlParserNodeInfo *xmlParserNodeInfoPtr; + +struct _xmlParserNodeInfo { + const struct _xmlNode* node; /* Position & line # that text that created the node begins & ends on */ unsigned long begin_pos; unsigned long begin_line; unsigned long end_pos; unsigned long end_line; -} _xmlParserNodeInfo; -typedef _xmlParserNodeInfo xmlParserNodeInfo; +}; -typedef struct xmlParserNodeInfoSeq { +typedef struct _xmlParserNodeInfoSeq xmlParserNodeInfoSeq; +typedef xmlParserNodeInfoSeq *xmlParserNodeInfoSeqPtr; +struct _xmlParserNodeInfoSeq { unsigned long maximum; unsigned long length; xmlParserNodeInfo* buffer; -} _xmlParserNodeInfoSeq; -typedef _xmlParserNodeInfoSeq xmlParserNodeInfoSeq; -typedef xmlParserNodeInfoSeq *xmlParserNodeInfoSeqPtr; +}; /** - * The parser is not (yet) a state based parser, but we need to maintain - * minimum state informations, especially for entities processing. + * The parser is now working also as a state based parser + * The recursive one use the stagte info for entities processing */ typedef enum { XML_PARSER_EOF = -1, /* nothing is to be parsed */ @@ -105,8 +108,10 @@ typedef enum { * takes as the only argument the parser context pointer, so migrating * to a state based parser for progressive parsing shouldn't be too hard. */ -typedef struct _xmlParserCtxt { - struct xmlSAXHandler *sax; /* The SAX handler */ +typedef struct _xmlParserCtxt xmlParserCtxt; +typedef xmlParserCtxt *xmlParserCtxtPtr; +struct _xmlParserCtxt { + struct _xmlSAXHandler *sax; /* The SAX handler */ void *userData; /* the document being built */ xmlDocPtr myDoc; /* the document being built */ int wellFormed; /* is the document well formed */ @@ -154,21 +159,19 @@ typedef struct _xmlParserCtxt { long nbChars; /* number of xmlChar processed */ long checkIndex; /* used by progressive parsing lookup */ -} _xmlParserCtxt; -typedef _xmlParserCtxt xmlParserCtxt; -typedef xmlParserCtxt *xmlParserCtxtPtr; +}; /** * a SAX Locator. */ -typedef struct xmlSAXLocator { +typedef struct _xmlSAXLocator xmlSAXLocator; +typedef xmlSAXLocator *xmlSAXLocatorPtr; +struct _xmlSAXLocator { const xmlChar *(*getPublicId)(void *ctx); const xmlChar *(*getSystemId)(void *ctx); int (*getLineNumber)(void *ctx); int (*getColumnNumber)(void *ctx); -} _xmlSAXLocator; -typedef _xmlSAXLocator xmlSAXLocator; -typedef xmlSAXLocator *xmlSAXLocatorPtr; +}; /** * a SAX handler is bunch of callbacks called by the parser when processing @@ -221,7 +224,9 @@ typedef int (*isStandaloneSAXFunc) (void *ctx); typedef int (*hasInternalSubsetSAXFunc) (void *ctx); typedef int (*hasExternalSubsetSAXFunc) (void *ctx); -typedef struct xmlSAXHandler { +typedef struct _xmlSAXHandler xmlSAXHandler; +typedef xmlSAXHandler *xmlSAXHandlerPtr; +struct _xmlSAXHandler { internalSubsetSAXFunc internalSubset; isStandaloneSAXFunc isStandalone; hasInternalSubsetSAXFunc hasInternalSubset; @@ -248,8 +253,7 @@ typedef struct xmlSAXHandler { fatalErrorSAXFunc fatalError; getParameterEntitySAXFunc getParameterEntity; cdataBlockSAXFunc cdataBlock; -} xmlSAXHandler; -typedef xmlSAXHandler *xmlSAXHandlerPtr; +}; /** * External entity loaders types diff --git a/result/HTML/fp40.htm b/result/HTML/fp40.htm index cdff5763..85f0931c 100644 --- a/result/HTML/fp40.htm +++ b/result/HTML/fp40.htm @@ -94,7 +94,7 @@ Extensions, see the Server Extensions Resource Kit Update at: Microsoft Knowledge Base

For further technical information on FrontPage, please consult Support Online. Use Support Online to easily search Microsoft Product Support Services' collection of resources including -technical articles from Microsoft's extensive Knowledge Base, FAQs, troubleshooters to find +technical articles from Microsoft's extensive Knowledge Base, FAQs, & troubleshooters to find fast, accurate answers. You can also customize the site to control your search using either keywords or the site's natural language search engine, which uses normal everyday language for answering inquiries, so you can write your question in your own words. To begin, go to diff --git a/result/HTML/wired.html b/result/HTML/wired.html index e8614509..509bc1b5 100644 --- a/result/HTML/wired.html +++ b/result/HTML/wired.html @@ -3,7 +3,7 @@ Top Stories News from Wired News -
+ +
@@ -66,7 +66,7 @@
-		True to the OriginalTrue to the Original
@@ -89,15 +89,15 @@
@@ -205,7 +205,7 @@
- + @@ -306,7 +306,7 @@ or PointCast Ongoing goings-on.

-Rants Raves +Rants & Raves
Readers on Apple's G4 ... AOL's passwords ... MS vs. Linux. @@ -404,8 +404,8 @@ or PointCast
An IS/IT resource
Sponsored by Sprint +ervlet/appservlet?from=/wired/sprint/&template=/security/security.html&SITE= +wired.com&BANNER=Sprint" style="text-decoration:none">Sprint @@ -445,7 +445,7 @@ wired.com&BANNER=Sprint" style="text-decoration:none">Spri Contruction workers in Berlin opened an old wound in the German psyche this week when they accidentally stumbled across Adolf Hitler's bunker while excavating near the Brandenburg Gate. The bunker, just south of the Gate, was where Hitler and his closest associates barricaded themselves as the Red Army approached Berlin in the waning days of World War II. It is also where the Führer and his bride, Eva Braun, committed suicide rather than fall into the hands of the Russians. Although the bunker's location has never been a mystery, it has been sealed off since the end of the war to keep neo-Nazis from turning it into a shrine.

-
  • More from Lycos +
  • More from Lycos

    • diff --git a/tree.c b/tree.c index bbeb90b1..f21c76e9 100644 --- a/tree.c +++ b/tree.c @@ -690,7 +690,7 @@ xmlNodeListGetString(xmlDocPtr doc, xmlNodePtr list, int inLine) { while (node != NULL) { if (node->type == XML_TEXT_NODE) { - if ((inLine) || (doc->type == XML_HTML_DOCUMENT_NODE)) { + if (inLine) { #ifndef XML_USE_BUFFER_CONTENT ret = xmlStrcat(ret, node->content); #else @@ -941,6 +941,10 @@ xmlFreeProp(xmlAttrPtr cur) { fprintf(stderr, "xmlFreeProp : property == NULL\n"); return; } + /* Check for ID removal -> leading to invalid references ! */ + if ((cur->node != NULL) && + (xmlIsID(cur->node->doc, cur->node, cur))) + xmlRemoveID(cur->node->doc, cur); if (cur->name != NULL) xmlFree((char *) cur->name); if (cur->val != NULL) xmlFreeNodeList(cur->val); memset(cur, -1, sizeof(xmlAttr)); diff --git a/tree.h b/tree.h index 0ff3a51c..13469942 100644 --- a/tree.h +++ b/tree.h @@ -67,12 +67,13 @@ typedef unsigned char xmlChar; * a DTD Notation definition */ -typedef struct xmlNotation { +typedef struct _xmlNotation xmlNotation; +typedef xmlNotation *xmlNotationPtr; +struct _xmlNotation { const xmlChar *name; /* Notation name */ const xmlChar *PublicID; /* Public identifier, if any */ const xmlChar *SystemID; /* System identifier, if any */ -} xmlNotation; -typedef xmlNotation *xmlNotationPtr; +}; /* * a DTD Attribute definition @@ -98,23 +99,25 @@ typedef enum { XML_ATTRIBUTE_FIXED } xmlAttributeDefault; -typedef struct xmlEnumeration { - struct xmlEnumeration *next; /* next one */ - const xmlChar *name; /* Enumeration name */ -} xmlEnumeration; +typedef struct _xmlEnumeration xmlEnumeration; typedef xmlEnumeration *xmlEnumerationPtr; +struct _xmlEnumeration { + struct _xmlEnumeration *next; /* next one */ + const xmlChar *name; /* Enumeration name */ +}; -typedef struct xmlAttribute { +typedef struct _xmlAttribute xmlAttribute; +typedef xmlAttribute *xmlAttributePtr; +struct _xmlAttribute { const xmlChar *elem; /* Element holding the attribute */ const xmlChar *name; /* Attribute name */ - struct xmlAttribute *next; /* list of attributes of an element */ + struct _xmlAttribute *next; /* list of attributes of an element */ xmlAttributeType type; /* The type */ xmlAttributeDefault def; /* the default */ const xmlChar *defaultValue;/* or the default value */ xmlEnumerationPtr tree; /* or the enumeration tree if any */ const xmlChar *prefix; /* the namespace prefix if any */ -} xmlAttribute; -typedef xmlAttribute *xmlAttributePtr; +}; /* * a DTD Element definition. @@ -133,14 +136,15 @@ typedef enum { XML_ELEMENT_CONTENT_PLUS } xmlElementContentOccur; -typedef struct xmlElementContent { +typedef struct _xmlElementContent xmlElementContent; +typedef xmlElementContent *xmlElementContentPtr; +struct _xmlElementContent { xmlElementContentType type; /* PCDATA, ELEMENT, SEQ or OR */ xmlElementContentOccur ocur; /* ONCE, OPT, MULT or PLUS */ const xmlChar *name; /* Element name */ - struct xmlElementContent *c1; /* first child */ - struct xmlElementContent *c2; /* second child */ -} xmlElementContent; -typedef xmlElementContent *xmlElementContentPtr; + struct _xmlElementContent *c1; /* first child */ + struct _xmlElementContent *c2; /* second child */ +}; typedef enum { XML_ELEMENT_TYPE_EMPTY = 1, @@ -149,13 +153,14 @@ typedef enum { XML_ELEMENT_TYPE_ELEMENT } xmlElementTypeVal; -typedef struct xmlElement { +typedef struct _xmlElement xmlElement; +typedef xmlElement *xmlElementPtr; +struct _xmlElement { const xmlChar *name; /* Element name */ xmlElementTypeVal type; /* The type */ xmlElementContentPtr content; /* the allowed element content */ xmlAttributePtr attributes; /* List of the declared attributes */ -} xmlElement; -typedef xmlElement *xmlElementPtr; +}; /* * An XML namespace. @@ -168,18 +173,21 @@ typedef enum { XML_LOCAL_NAMESPACE /* new style local scoping */ } xmlNsType; -typedef struct xmlNs { - struct xmlNs *next; /* next Ns link for this node */ +typedef struct _xmlNs xmlNs; +typedef xmlNs *xmlNsPtr; +struct _xmlNs { + struct _xmlNs *next; /* next Ns link for this node */ xmlNsType type; /* global or local */ const xmlChar *href; /* URL for the namespace */ const xmlChar *prefix; /* prefix for the namespace */ -} xmlNs; -typedef xmlNs *xmlNsPtr; +}; /* * An XML DtD, as defined by node link */ - struct xmlAttr *next; /* attribute list link */ - const xmlChar *name; /* the name of the property */ - struct xmlNode *val; /* the value of the property */ - xmlNs *ns; /* pointer to the associated namespace */ -} xmlAttr; -typedef xmlAttr *xmlAttrPtr; + struct _xmlNode *node; /* attr->node link */ + struct _xmlAttr *next; /* attribute list link */ + const xmlChar *name; /* the name of the property */ + struct _xmlNode *val; /* the value of the property */ + xmlNs *ns; /* pointer to the associated namespace */ +}; /* * An XML ID instance. */ -typedef struct xmlID { - struct xmlID *next; /* next ID */ +typedef struct _xmlID xmlID; +typedef xmlID *xmlIDPtr; +struct _xmlID { + struct _xmlID *next; /* next ID */ const xmlChar *value; /* The ID name */ xmlAttrPtr attr; /* The attribut holding it */ -} xmlID; -typedef xmlID *xmlIDPtr; +}; /* * An XML IDREF instance. */ -typedef struct xmlRef { - struct xmlRef *next; /* next Ref */ +typedef struct _xmlRef xmlRef; +typedef xmlRef *xmlRefPtr; +struct _xmlRef { + struct _xmlRef *next; /* next Ref */ const xmlChar *value; /* The Ref name */ xmlAttrPtr attr; /* The attribut holding it */ -} xmlRef; -typedef xmlRef *xmlRefPtr; +}; /* * A buffer structure @@ -239,31 +249,33 @@ typedef enum { XML_BUFFER_ALLOC_EXACT } xmlBufferAllocationScheme; -typedef struct xmlBuffer { +typedef struct _xmlBuffer xmlBuffer; +typedef xmlBuffer *xmlBufferPtr; +struct _xmlBuffer { xmlChar *content; /* The buffer content UTF8 */ unsigned int use; /* The buffer size used */ unsigned int size; /* The buffer size */ xmlBufferAllocationScheme alloc; /* The realloc method */ -} _xmlBuffer; -typedef _xmlBuffer xmlBuffer; -typedef xmlBuffer *xmlBufferPtr; +}; /* * A node in an XML tree. */ -typedef struct xmlNode { +typedef struct _xmlNode xmlNode; +typedef xmlNode *xmlNodePtr; +struct _xmlNode { #ifndef XML_WITHOUT_CORBA void *_private; /* for Corba, must be first ! */ void *vepv; /* for Corba, must be next ! */ #endif xmlElementType type; /* type number in the DTD, must be third ! */ - struct xmlDoc *doc; /* the containing document */ - struct xmlNode *parent; /* child->parent link */ - struct xmlNode *next; /* next sibling link */ - struct xmlNode *prev; /* previous sibling link */ - struct xmlNode *childs; /* parent->childs link */ - struct xmlNode *last; /* last child link */ - struct xmlAttr *properties; /* properties list */ + struct _xmlDoc *doc; /* the containing document */ + struct _xmlNode *parent; /* child->parent link */ + struct _xmlNode *next; /* next sibling link */ + struct _xmlNode *prev; /* previous sibling link */ + struct _xmlNode *childs; /* parent->childs link */ + struct _xmlNode *last; /* last child link */ + struct _xmlAttr *properties;/* properties list */ const xmlChar *name; /* the name of the node, or the entity */ xmlNs *ns; /* pointer to the associated namespace */ xmlNs *nsDef; /* namespace definitions on this node */ @@ -272,14 +284,14 @@ typedef struct xmlNode { #else xmlBufferPtr content; /* the content in a buffer */ #endif -} _xmlNode; -typedef _xmlNode xmlNode; -typedef _xmlNode *xmlNodePtr; +}; /* * An XML document. */ -typedef struct xmlDoc { +typedef struct _xmlDoc xmlDoc; +typedef xmlDoc *xmlDocPtr; +struct _xmlDoc { #ifndef XML_WITHOUT_CORBA void *_private; /* for Corba, must be first ! */ void *vepv; /* for Corba, must be next ! */ @@ -290,15 +302,13 @@ typedef struct xmlDoc { const xmlChar *encoding; /* encoding, if any */ int compression;/* level of zlib compression */ int standalone; /* standalone document (no external refs) */ - struct xmlDtd *intSubset; /* the document internal subset */ - struct xmlDtd *extSubset; /* the document external subset */ - struct xmlNs *oldNs; /* Global namespace, the old way */ - struct xmlNode *root; /* the document tree */ + struct _xmlDtd *intSubset; /* the document internal subset */ + struct _xmlDtd *extSubset; /* the document external subset */ + struct _xmlNs *oldNs; /* Global namespace, the old way */ + struct _xmlNode *root; /* the document tree */ void *ids; /* Hash table for ID attributes if any */ void *refs; /* Hash table for IDREFs attributes if any */ -} _xmlDoc; -typedef _xmlDoc xmlDoc; -typedef xmlDoc *xmlDocPtr; +}; /* * Variables. diff --git a/valid.c b/valid.c index f592c182..0efa3c6b 100644 --- a/valid.c +++ b/valid.c @@ -713,7 +713,7 @@ xmlScanAttributeDecl(xmlDtdPtr dtd, const xmlChar *elem) { * @ctxt: the validation context * @elem: the element name * - * Veryfy that the element don't have too many ID attributes + * Verify that the element don't have too many ID attributes * declared. * * Returns the number of ID attributes found. @@ -1504,7 +1504,7 @@ xmlFreeIDTable(xmlIDTablePtr table) { } /** - * xmlIsID + * xmlIsID: * @doc: the document * @elem: the element carrying the attribute * @attr: the attribute @@ -1517,13 +1517,21 @@ xmlFreeIDTable(xmlIDTablePtr table) { */ int xmlIsID(xmlDocPtr doc, xmlNodePtr elem, xmlAttrPtr attr) { + if (doc == NULL) return(0); + if (attr == NULL) return(0); if ((doc->intSubset == NULL) && (doc->extSubset == NULL)) { if (((attr->name[0] == 'I') || (attr->name[0] == 'i')) && ((attr->name[1] == 'D') || (attr->name[1] == 'd')) && (attr->name[2] == 0)) return(1); + } else if (doc->type == XML_HTML_DOCUMENT_NODE) { + if ((!xmlStrcmp(BAD_CAST "id", attr->name)) || + (!xmlStrcmp(BAD_CAST "name", attr->name))) + return(1); + return(0); } else { xmlAttributePtr attrDecl; + if (elem == NULL) return(0); attrDecl = xmlGetDtdAttrDesc(doc->intSubset, elem->name, attr->name); if ((attrDecl == NULL) && (doc->extSubset != NULL)) attrDecl = xmlGetDtdAttrDesc(doc->extSubset, elem->name, @@ -1535,6 +1543,42 @@ xmlIsID(xmlDocPtr doc, xmlNodePtr elem, xmlAttrPtr attr) { return(0); } +/** + * xmlRemoveID + * @doc: the document + * @attr: the attribute + * + * Remove the given attribute from the ID table maintained internally. + * + * Returns -1 if the lookup failed and 0 otherwise + */ +int +xmlRemoveID(xmlDocPtr doc, xmlAttrPtr attr) { + xmlIDPtr cur; + xmlIDTablePtr table; + int i; + + if (doc == NULL) return(-1); + if (attr == NULL) return(-1); + table = doc->ids; + if (table == NULL) + return(-1); + + /* + * Search the ID list. + */ + for (i = 0;i < table->nb_ids;i++) { + cur = table->table[i]; + if (cur->attr == attr) { + table->nb_ids--; + memmove(&table->table[i], &table->table[i+1], + (table->nb_ids - i) * sizeof(xmlIDPtr)); + return(0); + } + } + return(-1); +} + /** * xmlGetID: * @doc: pointer to the document @@ -1723,7 +1767,7 @@ xmlFreeRefTable(xmlRefTablePtr table) { } /** - * xmlIsRef + * xmlIsRef: * @doc: the document * @elem: the element carrying the attribute * @attr: the attribute @@ -1757,12 +1801,48 @@ xmlIsRef(xmlDocPtr doc, xmlNodePtr elem, xmlAttrPtr attr) { return(0); } +/** + * xmlRemoveRef + * @doc: the document + * @attr: the attribute + * + * Remove the given attribute from the Ref table maintained internally. + * + * Returns -1 if the lookup failed and 0 otherwise + */ +int +xmlRemoveRef(xmlDocPtr doc, xmlAttrPtr attr) { + xmlRefPtr cur; + xmlRefTablePtr table; + int i; + + if (doc == NULL) return(-1); + if (attr == NULL) return(-1); + table = doc->refs; + if (table == NULL) + return(-1); + + /* + * Search the Ref list. + */ + for (i = 0;i < table->nb_refs;i++) { + cur = table->table[i]; + if (cur->attr == attr) { + table->nb_refs--; + memmove(&table->table[i], &table->table[i+1], + (table->nb_refs - i) * sizeof(xmlRefPtr)); + return(0); + } + } + return(-1); +} + /** * xmlGetRef: * @doc: pointer to the document * @Ref: the Ref value * - * Search the attribute declaring the given Ref + * Search the next attribute declaring the given Ref * * Returns NULL if not found, otherwise the xmlAttrPtr defining the Ref */ diff --git a/valid.h b/valid.h index 7190bbfa..8c86b17b 100644 --- a/valid.h +++ b/valid.h @@ -23,11 +23,13 @@ extern "C" { typedef void (*xmlValidityErrorFunc) (void *ctx, const char *msg, ...); typedef void (*xmlValidityWarningFunc) (void *ctx, const char *msg, ...); -typedef struct xmlValidCtxt { +typedef struct _xmlValidCtxt xmlValidCtxt; +typedef xmlValidCtxt *xmlValidCtxtPtr; +struct _xmlValidCtxt { void *userData; /* user specific data block */ xmlValidityErrorFunc error; /* the callback in case of errors */ xmlValidityWarningFunc warning; /* the callback in case of warning */ -} xmlValidCtxt, *xmlValidCtxtPtr; +}; /* * ALl notation declarations are stored in a table @@ -36,12 +38,13 @@ typedef struct xmlValidCtxt { #define XML_MIN_NOTATION_TABLE 32 -typedef struct xmlNotationTable { +typedef struct _xmlNotationTable xmlNotationTable; +typedef xmlNotationTable *xmlNotationTablePtr; +struct _xmlNotationTable { int nb_notations; /* number of notations stored */ int max_notations; /* maximum number of notations */ xmlNotationPtr *table; /* the table of attributes */ -} xmlNotationTable; -typedef xmlNotationTable *xmlNotationTablePtr; +}; /* * ALl element declarations are stored in a table @@ -50,12 +53,13 @@ typedef xmlNotationTable *xmlNotationTablePtr; #define XML_MIN_ELEMENT_TABLE 32 -typedef struct xmlElementTable { +typedef struct _xmlElementTable xmlElementTable; +typedef xmlElementTable *xmlElementTablePtr; +struct _xmlElementTable { int nb_elements; /* number of elements stored */ int max_elements; /* maximum number of elements */ xmlElementPtr *table; /* the table of elements */ -} xmlElementTable; -typedef xmlElementTable *xmlElementTablePtr; +}; /* * ALl attribute declarations are stored in a table @@ -64,12 +68,13 @@ typedef xmlElementTable *xmlElementTablePtr; #define XML_MIN_ATTRIBUTE_TABLE 32 -typedef struct xmlAttributeTable { +typedef struct _xmlAttributeTable xmlAttributeTable; +typedef xmlAttributeTable *xmlAttributeTablePtr; +struct _xmlAttributeTable { int nb_attributes; /* number of attributes stored */ int max_attributes; /* maximum number of attributes */ xmlAttributePtr *table; /* the table of attributes */ -} xmlAttributeTable; -typedef xmlAttributeTable *xmlAttributeTablePtr; +}; /* * ALl IDs attributes are stored in a table @@ -78,12 +83,13 @@ typedef xmlAttributeTable *xmlAttributeTablePtr; #define XML_MIN_ID_TABLE 32 -typedef struct xmlIDTable { +typedef struct _xmlIDTable xmlIDTable; +typedef xmlIDTable *xmlIDTablePtr; +struct _xmlIDTable { int nb_ids; /* number of ids stored */ int max_ids; /* maximum number of ids */ xmlIDPtr *table; /* the table of ids */ -} xmlIDTable; -typedef xmlIDTable *xmlIDTablePtr; +}; /* * ALl Refs attributes are stored in a table @@ -92,12 +98,13 @@ typedef xmlIDTable *xmlIDTablePtr; #define XML_MIN_REF_TABLE 32 -typedef struct xmlRefTable { +typedef struct _xmlRefTable xmlRefTable; +typedef xmlRefTable *xmlRefTablePtr; +struct _xmlRefTable { int nb_refs; /* number of refs stored */ int max_refs; /* maximum number of refs */ xmlRefPtr *table; /* the table of refs */ -} xmlRefTable; -typedef xmlRefTable *xmlRefTablePtr; +}; /* Notation */ xmlNotationPtr xmlAddNotationDecl (xmlValidCtxtPtr ctxt, @@ -158,6 +165,7 @@ xmlAttrPtr xmlGetID (xmlDocPtr doc, int xmlIsID (xmlDocPtr doc, xmlNodePtr elem, xmlAttrPtr attr); +int xmlRemoveID (xmlDocPtr doc, xmlAttrPtr attr); /* IDREFs */ xmlRefPtr xmlAddRef (xmlValidCtxtPtr ctxt, @@ -169,6 +177,7 @@ void xmlFreeRefTable (xmlRefTablePtr table); int xmlIsRef (xmlDocPtr doc, xmlNodePtr elem, xmlAttrPtr attr); +int xmlRemoveRef (xmlDocPtr doc, xmlAttrPtr attr); /** * The public function calls related to validity checking diff --git a/xlink.h b/xlink.h index 15331481..0bcceeb8 100644 --- a/xlink.h +++ b/xlink.h @@ -148,12 +148,13 @@ typedef void * There is no default xlink callbacks, if one want to get link * recognition activated, those call backs must be provided before parsing. */ -typedef struct xlinkHandler { +typedef struct _xlinkHandler xlinkHandler; +typedef xlinkHandler *xlinkHandlerPtr; +struct _xlinkHandler { xlinkSimpleLinkFunk simple; xlinkExtendedLinkFunk extended; xlinkExtendedLinkSetFunk set; -} xlinkHandler; -typedef xlinkHandler *xlinkHandlerPtr; +}; /** * the default detection routine, can be overriden, they call the default diff --git a/xmlIO.h b/xmlIO.h index bf43de25..48bbcbb9 100644 --- a/xmlIO.h +++ b/xmlIO.h @@ -18,7 +18,9 @@ extern "C" { #endif -typedef struct xmlParserInputBuffer { +typedef struct _xmlParserInputBuffer xmlParserInputBuffer; +typedef xmlParserInputBuffer *xmlParserInputBufferPtr; +struct _xmlParserInputBuffer { /* Inputs */ FILE *file; /* Input on file handler */ void* gzfile; /* Input on a compressed stream */ @@ -29,9 +31,8 @@ typedef struct xmlParserInputBuffer { xmlBufferPtr buffer; /* Local buffer encoded in UTF-8 */ -} xmlParserInputBuffer; +}; -typedef xmlParserInputBuffer *xmlParserInputBufferPtr; /* * Interfaces diff --git a/xpath.h b/xpath.h index 84c83052..c0222e6e 100644 --- a/xpath.h +++ b/xpath.h @@ -18,16 +18,21 @@ extern "C" { #endif -typedef struct xmlXPathParserContext *xmlXPathParserContextPtr; +typedef struct _xmlXPathContext xmlXPathContext; +typedef xmlXPathContext *xmlXPathContextPtr; +typedef struct _xmlXPathParserContext xmlXPathParserContext; +typedef xmlXPathParserContext *xmlXPathParserContextPtr; /* * A node-set (an unordered collection of nodes without duplicates) */ -typedef struct xmlNodeSet { +typedef struct _xmlNodeSet xmlNodeSet; +typedef xmlNodeSet *xmlNodeSetPtr; +struct _xmlNodeSet { int nodeNr; /* # of node in the set */ int nodeMax; /* allocated space */ xmlNodePtr *nodeTab; /* array of nodes in no particular order */ -} xmlNodeSet, *xmlNodeSetPtr; +}; /* * An expression is evaluated to yield an object, which @@ -45,14 +50,16 @@ typedef struct xmlNodeSet { #define XPATH_STRING 4 #define XPATH_USERS 5 -typedef struct xmlXPathObject { +typedef struct _xmlXPathObject xmlXPathObject; +typedef xmlXPathObject *xmlXPathObjectPtr; +struct _xmlXPathObject { int type; xmlNodeSetPtr nodesetval; int boolval; double floatval; xmlChar *stringval; void *user; -} xmlXPathObject, *xmlXPathObjectPtr; +}; /* * A conversion function is associated to a type and used to cast @@ -64,19 +71,23 @@ typedef int (*xmlXPathConvertFunc) (xmlXPathObjectPtr obj, int type); * Extra type: a name and a conversion function. */ -typedef struct xmlXPathType { +typedef struct _xmlXPathType xmlXPathType; +typedef xmlXPathType *xmlXPathTypePtr; +struct _xmlXPathType { const xmlChar *name; /* the type name */ xmlXPathConvertFunc func; /* the conversion function */ -} xmlXPathType, *xmlXPathTypePtr; +}; /* * Extra variable: a name and a value. */ -typedef struct xmlXPathVariable { +typedef struct _xmlXPathVariable xmlXPathVariable; +typedef xmlXPathVariable *xmlXPathVariablePtr; +struct _xmlXPathVariable { const xmlChar *name; /* the variable name */ xmlXPathObjectPtr value; /* the value */ -} xmlXPathVariable, *xmlXPathVariablePtr; +}; /* * an evaluation function, the parameters are on the context stack @@ -88,10 +99,12 @@ typedef void (*xmlXPathEvalFunc)(xmlXPathParserContextPtr ctxt, int nargs); * Extra function: a name and a evaluation function. */ -typedef struct xmlXPathFunct { +typedef struct _xmlXPathFunct xmlXPathFunct; +typedef xmlXPathFunct *xmlXPathFuncPtr; +struct _xmlXPathFunct { const xmlChar *name; /* the function name */ xmlXPathEvalFunc func; /* the evaluation function */ -} xmlXPathFunc, *xmlXPathFuncPtr; +}; /* * An axis traversal function. To traverse an axis, the engine calls @@ -106,10 +119,12 @@ typedef xmlXPathObjectPtr (*xmlXPathAxisFunc) (xmlXPathParserContextPtr ctxt, * Extra axis: a name and an axis function. */ -typedef struct xmlXPathAxis { +typedef struct _xmlXPathAxis xmlXPathAxis; +typedef xmlXPathAxis *xmlXPathAxisPtr; +struct _xmlXPathAxis { const xmlChar *name; /* the axis name */ xmlXPathAxisFunc func; /* the search function */ -} xmlXPathAxis, *xmlXPathAxisPtr; +}; /* * Expression evaluation occurs with respect to a context. @@ -121,7 +136,7 @@ typedef struct xmlXPathAxis { * - the set of namespace declarations in scope for the expression */ -typedef struct xmlXPathContext { +struct _xmlXPathContext { xmlDocPtr doc; /* The current document */ xmlNodePtr node; /* The current node */ xmlNodeSetPtr nodelist; /* The current node list */ @@ -146,13 +161,13 @@ typedef struct xmlXPathContext { xmlNsPtr *namespaces; /* The namespaces lookup */ int nsNr; /* the current Namespace index */ void *user; /* user defined extra info */ -} xmlXPathContext, *xmlXPathContextPtr; +}; /* * An XPath parser context, it contains pure parsing informations, * an xmlXPathContext, and the stack of objects. */ -typedef struct xmlXPathParserContext { +struct _xmlXPathParserContext { const xmlChar *cur; /* the current char being parsed */ const xmlChar *base; /* the full expression */ @@ -163,7 +178,7 @@ typedef struct xmlXPathParserContext { int valueNr; /* number of values stacked */ int valueMax; /* max number of values stacked */ xmlXPathObjectPtr *valueTab; /* stack of values */ -} xmlXPathParserContext; +}; /* * An XPath function