diff --git a/AUTHORS b/AUTHORS index 4ab613d8..e3f77b70 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1,3 @@ -Daniel Veillard +Daniel Veillard +Bjorn Reese +William Brack diff --git a/ChangeLog b/ChangeLog index cda4f008..ad1ae58f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Sun Jun 24 14:05:54 CEST 2001 Daniel Veillard + + * AUTHORS: added William and Bjorn + * include/libxml/*.h *.c README doc/*.html etc.: changed old email to + daniel@veillard.com hopefully I won't have to do this again + * doc/Makefile.am doc/html/*.html: cleanup makefile, checked that + docs can be rebuilt cleanly now + * include/libxml/xml*version.h*: removed include/libxml/xmlversion.h + from CVs it's generated, added include/libxml/xmlwin32version.h + also generated but which should change far less frequently. + * catalog.c nanoftp.c: made sure to include libxml.h not + libxml/xmlversion.h directly + * include/libxml/*.h: include xmlwin32version.h instead of xmlversion.h + when compiling on WIN32 and MSC + Sat Jun 23 23:54:12 CEST 2001 Daniel Veillard * include/Makefile.am include/libxml/Makefile.am configure.in: diff --git a/Copyright b/Copyright index c01ea4a7..378ff504 100644 --- a/Copyright +++ b/Copyright @@ -22,6 +22,6 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -Daniel Veillard +Daniel Veillard Fri Jul 24 1998 diff --git a/DOCBparser.c b/DOCBparser.c index 49ea57b2..4a07496e 100644 --- a/DOCBparser.c +++ b/DOCBparser.c @@ -7,7 +7,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #include "libxml.h" diff --git a/HACKING b/HACKING index cafb99a2..e9c2a7d9 100644 --- a/HACKING +++ b/HACKING @@ -5,7 +5,7 @@ NOTE: http://xmlsoft.org/upgrade.html - in the meantime the old 1.x code has been tagged with LIB_XML_1_BRANCH extract this version and drop me a mail if you want me to take care of - the update of your module to libxml-2 + the update of your module to libxml-2 - the 1.x branch has a separate commit policy, please check the HACKING file for this branch diff --git a/HTMLparser.c b/HTMLparser.c index 61e61b7b..c49f561d 100644 --- a/HTMLparser.c +++ b/HTMLparser.c @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #include "libxml.h" diff --git a/HTMLtree.c b/HTMLtree.c index ae0374c8..54614078 100644 --- a/HTMLtree.c +++ b/HTMLtree.c @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ diff --git a/README b/README index feb5a8c0..8ee6633b 100644 --- a/README +++ b/README @@ -7,10 +7,10 @@ Full documentation is available on-line at This code is released under the LGPL or the W3C IPR, pick the one you prefer. -A mailing-list is available, to subscribe: - echo "subscribe xml" | mail majordomo@rpmfind.net +A mailing-list xml@gnome.org is available, to subscribe: + http://mail.gnome.org/mailman/listinfo/xml The list archive is at: - http://xmlsoft.org/messages/ + http://mail.gnome.org/archives/xml/ -Daniel.Veillard@w3.org +daniel@veillard.com diff --git a/SAX.c b/SAX.c index 03f3988a..72b82e46 100644 --- a/SAX.c +++ b/SAX.c @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel Veillard + * Daniel Veillard */ diff --git a/aclocal.m4 b/aclocal.m4 index 869e5fcc..e3726759 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -620,31 +620,35 @@ esac ]) # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl convenience library, adds --enable-ltdl-convenience to -# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor -# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed -# to be `${top_builddir}/libltdl'. Make sure you start DIR with -# '${top_builddir}/' (note the single quotes!) if your package is not -# flat, and, if you're not using automake, define top_builddir as -# appropriate in the Makefiles. +# the libltdl convenience library and INCLTDL to the include flags for +# the libltdl header and adds --enable-ltdl-convenience to the +# configure arguments. Note that LIBLTDL and INCLTDL are not +# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not +# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed +# with '${top_builddir}/' and INCLTDL will be prefixed with +# '${top_srcdir}/' (note the single quotes!). If your package is not +# flat and you're not using automake, define top_builddir and +# top_srcdir appropriately in the Makefiles. AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl case "$enable_ltdl_convenience" in no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; "") enable_ltdl_convenience=yes ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac - LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la - INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) + LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la + INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl installable library, and adds --enable-ltdl-install to -# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor -# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed -# to be `${top_builddir}/libltdl'. Make sure you start DIR with -# '${top_builddir}/' (note the single quotes!) if your package is not -# flat, and, if you're not using automake, define top_builddir as -# appropriate in the Makefiles. +# the libltdl installable library and INCLTDL to the include flags for +# the libltdl header and adds --enable-ltdl-install to the configure +# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is +# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed +# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will +# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed +# with '${top_srcdir}/' (note the single quotes!). If your package is +# not flat and you're not using automake, define top_builddir and +# top_srcdir appropriately in the Makefiles. # In the future, this macro may have to be called after AC_PROG_LIBTOOL. AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_CHECK_LIB(ltdl, main, @@ -657,8 +661,8 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ]) if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la - INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) + LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la + INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" diff --git a/configure.in b/configure.in index 594fc2ec..9dd0f6f7 100644 --- a/configure.in +++ b/configure.in @@ -454,5 +454,5 @@ then ln -s $srcdir/include/libxml libxml fi -AC_OUTPUT(libxml.spec Makefile include/Makefile include/libxml/Makefile doc/Makefile example/Makefile include/libxml/xmlversion.h xml2-config libxml-2.0.pc xml2Conf.sh) +AC_OUTPUT(libxml.spec Makefile include/Makefile include/libxml/Makefile doc/Makefile example/Makefile include/libxml/xmlversion.h include/libxml/xmlwin32version.h xml2-config libxml-2.0.pc xml2Conf.sh) diff --git a/debugXML.c b/debugXML.c index 386be444..512a366e 100644 --- a/debugXML.c +++ b/debugXML.c @@ -4,7 +4,7 @@ * * See Copyright for the status of this software. * - * Daniel Veillard + * Daniel Veillard */ #include "libxml.h" diff --git a/doc/FAQ.html b/doc/FAQ.html index f6cf9aba..48217e63 100644 --- a/doc/FAQ.html +++ b/doc/FAQ.html @@ -267,7 +267,7 @@ pnode=pxmlDoc->children->children;
  • etc ...
    • -

    Daniel Veillard

    +

    Daniel Veillard

    $Id$

    diff --git a/doc/Makefile.am b/doc/Makefile.am index 7feec359..58d2a901 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -17,9 +17,6 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)/html # html_DATA = gnome-dev-info.html scan: - @(if [ -L $(DOC_SOURCE_DIR)/libxml ] ; then rm -f $(DOC_SOURCE_DIR)/libxml ; fi) - @(if [ -L $(DOC_SOURCE_DIR)/include ] ; then rm -f $(DOC_SOURCE_DIR)/include ; fi) - @(if [ -L $(DOC_SOURCE_DIR)/include/libxml ] ; then rm -f $(DOC_SOURCE_DIR)/include/libxml ; fi) gtkdoc-scan --module=libxml --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="acconfig.h config.h" templates: scan diff --git a/doc/encoding.html b/doc/encoding.html index d79a0b8c..24573e39 100644 --- a/doc/encoding.html +++ b/doc/encoding.html @@ -281,7 +281,7 @@ will work. You may also have some troubles saving back.

    libxml-2.0.0, but a lot of features and corrections are really available only starting 2.2.

    -

    Daniel Veillard

    +

    Daniel Veillard

    $Id$

    diff --git a/doc/gnome-xml.sgml b/doc/gnome-xml.sgml index 07123c2c..a89de42a 100644 --- a/doc/gnome-xml.sgml +++ b/doc/gnome-xml.sgml @@ -32,7 +32,7 @@ Veillard
    - Daniel.Veillard@w3.org + daniel@veillard.com
    diff --git a/doc/html/book1.html b/doc/html/book1.html index 998ee9ca..17db1777 100644 --- a/doc/html/book1.html +++ b/doc/html/book1.html @@ -54,7 +54,7 @@ CLASS="AFFILIATION" CLASS="ADDRESS" >

        Daniel.Veillard@w3.org
    +>     daniel@veillard.com
      

    + diff --git a/doc/html/libxml-catalog.html b/doc/html/libxml-catalog.html index b10cab7d..57e010c2 100644 --- a/doc/html/libxml-catalog.html +++ b/doc/html/libxml-catalog.html @@ -122,7 +122,7 @@ NAME="LIBXML-CATALOG" >

    Name

    Synopsis

    +#define XML_CATALOGS_NAMESPACE int xmlLoadCatalog

    Description

    Details

    XML_CATALOGS_NAMESPACE

    #define     XML_CATALOGS_NAMESPACE

    The namespace for the XML Catalogs elements

    the file. 

    the system ID string the resource name if found or NULL otherwise. 

    the public ID string the system ID if found or NULL otherwise. 

    Name

    Synopsis

    Description

    Details

    a string prompt a string which will be freed by the Shell 

    xmlShellCtxtPtr

    typedef xmlShellCtxt *xmlShellCtxtPtr;

    a shell context  a string argument  a first node  a second node an int, negative returns indicating errors 

    the initial document  the output buffer  the line reading function  the output FILE* 

    Name

    Synopsis

    Description

    Details

    docbParserCtxt

    typedef xmlParserCtxt docbParserCtxt;

    docbParserCtxtPtr

    typedef xmlParserCtxtPtr docbParserCtxtPtr;

    docbParserNodeInfo

    typedef xmlParserNodeInfo docbParserNodeInfo;

    docbSAXHandler

    typedef xmlSAXHandler docbSAXHandler;

    docbSAXHandlerPtr

    typedef xmlSAXHandlerPtr docbSAXHandlerPtr;

    docbParserInput

    typedef xmlParserInput docbParserInput;

    docbParserInputPtr

    typedef xmlParserInputPtr docbParserInputPtr;

    docbDocPtr

    typedef xmlDocPtr docbDocPtr;

    docbNodePtr

    typedef xmlNodePtr docbNodePtr;

    a pointer to an array of bytes to store the result  the length of out  a pointer to an array of UTF-8 chars  the length of in  the quote character to escape (' or ") or zero. 0 if success, -2 if the transcoding fails, or -1 otherwise -The value of inlen after return is the number of octets consumed -as the return value is positive, else unpredictiable. -The value of outlen after return is the number of octets consumed. 

    a pointer to an array of xmlChar  a free form C string describing the SGML 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 SGML document encoding, or NULL the resulting document tree 

    the filename  a free form C string describing the SGML 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 document encoding, or NULL the resulting document tree 

    an SGML parser context 

    a SAX handler  The user data returned on SAX callbacks  a pointer to an array of chars  number of chars in the array  an optional file name or URI  an optional encoding the new parser context or NULL 

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

    the filename  the SGML document encoding, or NULL the new parser context or NULL 

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

    Name

    Synopsis

    Description

    Details

    a pointer ot an array of bytes to store the UTF-8 result  the lenght of out  a pointer ot an array of chars in the original encoding  the lenght of in the number of byte written, or -1 by lack of space, or -2 -if the transcoding failed. -The value of inlen after return is the number of octets consumed -as the return value is positive, else unpredictiable. -The value of outlen after return is the number of ocetes consumed. 

    a pointer ot an array of bytes to store the result  the lenght of out  a pointer ot an array of UTF-8 chars  the lenght of in the number of byte written, or -1 by lack of space, or -2 -if the transcoding failed. -The value of inlen after return is the number of octets consumed -as the return value is positive, else unpredictiable. -The value of outlen after return is the number of ocetes consumed. 

    xmlCharEncodingHandlerPtr

    typedef xmlCharEncodingHandler *xmlCharEncodingHandlerPtr;

    the xmlCharEncodingHandlerPtr handler block 

    a string describing the char encoding. the handler or NULL if not found 

    the encoding name as parsed, in UTF-8 format (ASCII actually)  the alias name as parsed, in UTF-8 format (ASCII actually) 0 in case of success, -1 in case of error 

    the alias name as parsed, in UTF-8 format (ASCII actually) 0 in case of success, -1 in case of error 

    the alias name as parsed, in UTF-8 format (ASCII actually) NULL if not found the original name otherwise 

    the encoding name as parsed, in UTF-8 format (ASCII actually) one of the XML_CHAR_ENCODING_... values or XML_CHAR_ENCODING_NONE -if not recognized. 

    the encoding the canonical name for the given encoding 

    a pointer to the first bytes of the XML entity, must be at least -4 bytes long.  pointer to the length of the buffer one of the XML_CHAR_ENCODING_... values. 

    char enconding transformation data structure  an xmlBuffer for the output.  an xmlBuffer for the input the number of byte written if success, or --1 general error --2 if the transcoding fails (for *in is not valid utf8 string or -the result of transformation can't fit into the encoding we want), or 

    char enconding transformation data structure  an xmlBuffer for the output.  an xmlBuffer for the input the number of byte written if success, or --1 general error --2 if the transcoding fails (for *in is not valid utf8 string or -the result of transformation can't fit into the encoding we want), or 

    char enconding transformation data structure  an xmlBuffer for the output.  an xmlBuffer for the input the number of byte written if success, or --1 general error --2 if the transcoding fails (for *in is not valid utf8 string or -the result of transformation can't fit into the encoding we want), or 

    char enconding transformation data structure 0 if success, or -1 in case of error 

    a pointer to an array of bytes to store the result  the length of out  a pointer to an array of UTF-8 chars  the length of in 0 if success, -2 if the transcoding fails, or -1 otherwise -The value of inlen after return is the number of octets consumed -as the return value is positive, else unpredictiable. -The value of outlen after return is the number of ocetes consumed. 

    a pointer to an array of bytes to store the result  the length of out  a pointer to an array of ISO Latin 1 chars  the length of in 0 if success, or -1 otherwise -The value of inlen after return is the number of octets consumed -as the return value is positive, else unpredictiable. -The value of outlen after return is the number of ocetes consumed. 

    Pointer to putative utf-8 encoded string.  true if utf is valid. 

    a sequence of UTF-8 encoded bytes  the number of characters in the array the storage size of -the first 'len' characters of ARRAY  

    the input UTF8 *  the len of utf (in chars) a new UTF8 * or NULL 

    the input UTF8 *  the position of the desired UTF8 char (in chars) a pointer to the UTF8 character or NULL 

    the input UTF8 *  the UTF8 character to be found the relative character position of the desired char -or -1 if not found 

    a sequence of UTF-8 encoded bytes a pointer to a newly created string -or NULL if any problem 

    a sequence of UTF-8 encoded bytes the number of characters in the string or -1 in case of error 

    Name

    Synopsis

    Description

    Details

    struct xmlEntity {
-#ifndef XML_WITHOUT_CORBA
     void           *_private;	        /* for Corba, must be first ! */
-#endif
     xmlElementType          type;       /* XML_ENTITY_DECL, must be second ! */
     const xmlChar          *name;	/* Attribute name */
     struct _xmlNode    *children;	/* NULL */
@@ -468,59 +466,33 @@ CLASS="PROGRAMLISTING"
 >
    xmlEntityPtr
    typedef xmlEntity *xmlEntityPtr;
    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 a pointer to the entity or NULL in case of error 
      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 a pointer to the entity or NULL in case of error 
      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 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 
      An XML buffer.   An entity table 
    Name
    Synopsis
    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;
    htmlElemDescPtr
    typedef htmlElemDesc *htmlElemDescPtr;
    htmlEntityDescPtr
    typedef htmlEntityDesc *htmlEntityDescPtr;
      The tag name in lowercase the related htmlElemDescPtr or NULL if not found. 
     the entity name the associated htmlEntityDescPtr if found, NULL otherwise. 
     the entity's unicode value the associated htmlEntityDescPtr if found, NULL otherwise. 
      the HTML document   the HTML element 1 if autoclosed, 0 otherwise 
      the HTML document   The tag name   the HTML element 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 
      a pointer to an array of bytes to store the result   the length of out   a pointer to an array of UTF-8 chars   the length of in 0 if success, -2 if the transcoding fails, or -1 otherwise
-The value of inlen after return is the number of octets consumed
-as the return value is positive, else unpredictiable.
-The value of outlen after return is the number of octets consumed. 
      a pointer to an array of bytes to store the result   the length of out   a pointer to an array of UTF-8 chars   the length of in  the quote character to escape (' or ") or zero. 0 if success, -2 if the transcoding fails, or -1 otherwise
-The value of inlen after return is the number of octets consumed
-as the return value is positive, else unpredictiable.
-The value of outlen after return is the number of octets consumed. 
      an attribute name 1 is the attribute is a script 0 otherwise 
      int 0 or 1  the last value for 0 for no handling, 1 for auto insertion. 
      an HTML parser context 
      a SAX handler   The user data returned on SAX callbacks   a pointer to an array of chars   number of chars in the array   an optional file name or URI   an optional encoding the new parser context or NULL 
      an XML parser context   an char array   the size in byte of the chunk   last chunk indicator zero if no error, the xmlParserErrors otherwise. 
    Name
    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

    #define HTML_PRESERVE_NODE	XML_CDATA_SECTION_NODE
    #define HTML_PRESERVE_NODE

    #define HTML_PI_NODE		XML_PI_NODE
    #define HTML_PI_NODE

    URI for the dtd, or NULL  the external ID of the DTD, or NULL a new document 

    URI for the dtd, or NULL  the external ID of the DTD, or NULL a new document, do not intialize the DTD if not provided 

    the document the current encoding as flagged in the HTML source 

    the document  the encoding string 0 in case of success and -1 in case of error 

    the document  OUT: the memory pointer  OUT: the memory length 

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

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

    the HTML buffer output  the document  the current node 

    the FILE pointer  the document  the current node 

    the FILE pointer  the document  the current node  the document encoding  should formatting spaces been added  the number of byte written or -1 in case of failure. 

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

    the filename  the document  the document encoding  should formatting spaces been added  the number of byte written or -1 in case of failure. 

    Name

    Synopsis

    Description

    Details

    user provided data for the callback  the file name (including "->" when links are shown)  the attribute string  the owner string  the group string  the file size  the link count  the year  the month  the day  the hour  the minute 

    the user provided context  the data received  its size in bytes 

    The URL used to initialize the context 

    an FTP context 

    an FTP server name  the port (use 21 if 0) 

    the URL to the resource 

    an FTP context -1 in case of error, 0 otherwise 

    an FTP context -1 incase of error, 0 otherwise 

    an FTP context -1 in case of error, 0 otherwise 

    The proxy URL used to initialize the proxy context 

    the proxy host name  the proxy port  the proxy user name  the proxy password  the type of proxy 1 for using SITE, 2 for USER ab 

    an FTP context  The URL used to update the context 0 if Ok, -1 in case of error (other host). 

    an FTP context the code number 

    an FTP context the code number, or 0 

    an FTP context  a directory on the server -1 incase of error, 1 if CWD worked, 0 if it failed 

    an FTP context -1 incase of error, 0 otherwise 

    an FTP context -1 incase of error, 0 otherwise 

    an FTP context  the user callback  the user callback data  optional files to list -1 incase of error, 0 otherwise 

    an FTP context  the file to retrieve (or NULL if path is in context). the socket for the data connection, or <0 in case of error 

    an FTP context  the user callback  the user callback data  the file to retrieve -1 incase of error, 0 otherwise 

    the FTP 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. 

    Name

    Synopsis

    Description

    Details

    The proxy URL used to initialize the proxy context 

    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  the HTTP method to use  the input string if any  the Content-Type information IN and OUT  the redirected URL OUT  the extra headers 

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

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

    the HTTP context the HTTP return code for the request. 

    the HTTP context the stashed value of the WWW-Authenticate or Proxy-Authenticate -header. 

    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 
    #define XML_DEFAULT_VERSION	"1.0"
    #define XML_DEFAULT_VERSIONxmlParserInputPtr

    typedef xmlParserInput *xmlParserInputPtr;

    xmlParserNodeInfoPtr

    typedef xmlParserNodeInfo *xmlParserNodeInfoPtr;

    xmlParserNodeInfoSeqPtr

    typedef xmlParserNodeInfoSeq *xmlParserNodeInfoSeqPtr;

    #define XML_DETECT_IDS		2
    #define XML_DETECT_IDS

    #define XML_COMPLETE_ATTRS	4
    #define XML_COMPLETE_ATTRS

    xmlParserCtxtPtr

    typedef xmlParserCtxt *xmlParserCtxtPtr;

    xmlSAXLocatorPtr

    typedef xmlSAXLocator *xmlSAXLocatorPtr;

    xmlSAXHandlerPtr

    typedef xmlSAXHandler *xmlSAXHandlerPtr;

    The System ID of the resource requested  The Public ID of the resource requested 

    #define xmlSubstituteEntitiesDefaultValue xmlSubstituteEntitiesDefaultVal
    #define xmlSubstituteEntitiesDefaultValue

    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 input char *  the len of cur a new xmlChar * or NULL 

    the input char * 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 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 

    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 

    the first xmlChar *  the second xmlChar * 1 if they are equal, 0 if they are different 

    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 *, the original cur is reallocated if needed -and should not be freed 

    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. 

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

    an XML parser context 

    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. 

    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 

    the SAX handler block  the filename the resulting document tree 

    the filename 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. 

    the SAX handler block or NULL  an Input Buffer  the charset encoding if known the resulting xmlDtdPtr or NULL in case of error. -input will be freed at parsing end. 

    the document the chunk pertains to  the SAX handler bloc (possibly NULL)  The user data returned on SAX callbacks (possibly NULL)  Used for loop detection, use 0  the input string in UTF8 or ISO-Latin (zero terminated)  the return value for the set of parsed nodes 0 if the chunk is well balanced, -1 in case of args problem and -the parser error code otherwise 

    the document the chunk pertains to  the SAX handler bloc (possibly NULL)  The user data returned on SAX callbacks (possibly NULL)  Used for loop detection, use 0  the URL for the entity to load  the System ID for the entity to load  the return value for the set of parsed nodes 0 if the entity is well formed, -1 in case of args problem and -the parser error code otherwise 

    the existing parsing context  the URL for the entity to load  the System ID for the entity to load  the return value for the set of parsed nodes 0 if the entity is well formed, -1 in case of args problem and -the parser error code otherwise 

    an XML parser context 

    an XML parser context 

    an XML parser context 

    an XML parser context  a xmlChar * buffer  a file name 

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

    a SAX handler  The user data returned on SAX callbacks  a pointer to an array of chars  number of chars in the array  an optional file name or URI the new parser context or NULL 

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

    a SAX handler  The user data returned on SAX callbacks  an I/O read function  an I/O close function  an I/O handler  the charset encoding if known the new parser context or NULL 

    an XML parser context  an I/O Input  the charset encoding if known the new input stream or NULL 

    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 

    Name

    Synopsis

    Description

    Details

    #define XML_MAX_NAMELEN 100
    #define XML_MAX_NAMELEN

    #define INPUT_CHUNK	250
    #define INPUT_CHUNK

    an UNICODE value (int) 

    an UNICODE value (int) 

    #define IS_BASECHAR(c) xmlIsBaseChar(c)
    #define IS_BASECHAR(c)

    an UNICODE value (int) 

    #define IS_DIGIT(c) xmlIsDigit(c)
    #define IS_DIGIT(c)

    an UNICODE value (int) 

    #define IS_COMBINING(c) xmlIsCombining(c)
    #define IS_COMBINING(c)

    an UNICODE value (int) 

    #define IS_EXTENDER(c) xmlIsExtender(c)
    #define IS_EXTENDER(c)

    an UNICODE value (int) 

    #define IS_IDEOGRAPHIC(c) xmlIsIdeographic(c)
    #define IS_IDEOGRAPHIC(c)

    an UNICODE value (int) 

    #define IS_LETTER(c) (IS_BASECHAR(c) || IS_IDEOGRAPHIC(c))
    #define IS_LETTER(c)

    an UNICODE value (int) 

    #define IS_PUBIDCHAR(c)	xmlIsPubidChar(c)
    #define IS_PUBIDCHAR(c)

    an UNICODE value (int) 

    and UTF8 string pointer 

    and UTF8 string pointer 

    and UTF8 string pointer 

    an unicode character (int) 0 if not, non-zero otherwise 

    an unicode character (int) 0 if not, non-zero otherwise 

    an unicode character (int) 0 if not, non-zero otherwise 

    an unicode character (int) 0 if not, non-zero otherwise 

    an unicode character (int) 0 if not, non-zero otherwise 

    an unicode character (int) 0 if not, non-zero otherwise 

    an unicode character (int) 0 if not, non-zero otherwise 

    an unicode character (int) 0 if not, non-zero otherwise 

    an unicode character (int) 0 if not, non-zero otherwise 

    the filename the new parser context or NULL 

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

    the xmlParserCtxtPtr or NULL 

    the entity URL  the entity PUBLIC ID  a posible base for the target URI the new parser context or NULL 

    the parser context  the encoding value (number) 0 in case of success, -1 otherwise 

    the parser context  the encoding handler 0 in case of success, -1 otherwise 

    an XML parser context  an XML entity pointer. 

    an XML parser context  an memory buffer the new input stream 

    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 the new input stream or NULL 

    an XML parser context  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. 

    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 

    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 

    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 

    ctxt : 
    Returns : 

    xmlParseElementChildrenContentDecl ()

    xmlElementContentPtr xmlParseElementChildrenContentDecl
+                                            (xmlParserCtxtPtr ctxt);

    parse the declaration for a Mixed Element content +The leading '(' and spaces have been skipped in xmlParseElementContentDecl

    [47] children ::= (choice | seq) ('?' | '*' | '+')?

    [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')?

    [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')'

    [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')'

    [ VC: Proper Group/PE Nesting ] applies to [49] and [50] +TODO Parameter-entity replacement text must be properly nested +with parenthetized groups. That is to say, if either of the +opening or closing parentheses in a choice, seq, or Mixed +construct is contained in the replacement text for a parameter +entity, both must be contained in the same replacement text. For +interoperability, if a parameter-entity reference appears in a +choice, seq, or Mixed construct, its replacement text should not +be empty, and neither the first nor last non-blank character of +the replacement text should be a connector (| or ,).

    ctxt : 
    Returns : 

    xmlParseElementContentDecl ()

    int         xmlParseElementContentDecl      (xmlParserCtxtPtr ctxt,
+                                             xmlChar *name,
+                                             xmlElementContentPtr *result);

    parse the declaration for an Element content either Mixed or Children, +the cases EMPTY and ANY are handled directly in xmlParseElementDecl

    [46] contentspec ::= 'EMPTY' | 'ANY' | Mixed | children

    ctxt : 
    name : 
    result : 
    Returns : 

    xmlParseElementDecl ()

    int         xmlParseElementDecl             (xmlParserCtxtPtr ctxt);

    parse an Element declaration.

    [45] elementdecl ::= '<!ELEMENT' S Name S contentspec S? '>'

    [ VC: Unique Element Type Declaration ] +No element type may be declared more than once

    xmlParseElementChildrenContentDecl ()

    xmlElementContentPtr xmlParseElementChildrenContentDecl
-                                            (xmlParserCtxtPtr ctxt);

    parse the declaration for a Mixed Element content -The leading '(' and spaces have been skipped in xmlParseElementContentDecl

    [47] children ::= (choice | seq) ('?' | '*' | '+')?

    [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')?

    [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')'

    [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')'

    [ VC: Proper Group/PE Nesting ] applies to [49] and [50] -TODO Parameter-entity replacement text must be properly nested -with parenthetized groups. That is to say, if either of the -opening or closing parentheses in a choice, seq, or Mixed -construct is contained in the replacement text for a parameter -entity, both must be contained in the same replacement text. For -interoperability, if a parameter-entity reference appears in a -choice, seq, or Mixed construct, its replacement text should not -be empty, and neither the first nor last non-blank character of -the replacement text should be a connector (| or ,).

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

    xmlParseElementContentDecl ()

    int         xmlParseElementContentDecl      (xmlParserCtxtPtr ctxt,
-                                             xmlChar *name,
-                                             xmlElementContentPtr *result);

    parse the declaration for an Element content either Mixed or Children, -the cases EMPTY and ANY are handled directly in xmlParseElementDecl

    [46] contentspec ::= 'EMPTY' | 'ANY' | Mixed | children

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

    xmlParseElementDecl ()

    int         xmlParseElementDecl             (xmlParserCtxtPtr ctxt);

    parse an Element declaration.

    [45] elementdecl ::= '<!ELEMENT' S Name S contentspec S? '>'

    [ VC: Unique Element Type Declaration ] -No element type may be declared more than once

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

    xmlParseMarkupDecl ()

    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. 

    an XML parser context the element name parsed 

    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 

    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 ! 

    the parser context  the input string  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 ! 

    the XML parser context the number of space chars skipped 

    the XML parser context  pointer to the beginning of the char  pointer to the length of the char read the current char value and its lenght 

    the parser context 

    the parser context 

    the XML parser context  pointer to the length of the char read the current char value and its lenght 

    pointer to an arry of xmlChar  the char value the number of xmlChar written 

    Ignored, compatibility  pointer to an arry of xmlChar  the char value the number of xmlChar written 

    the XML parser context 

    an XML parser input 

    the filename  a free form C string describing the HTML document encoding, or NULL the new parser context or NULL 

    Name

    Synopsis

    Description

    Details

    the user data (XML parser context) a xmlChar * 

    the user data (XML parser context) a xmlChar * 

    the user data (XML parser context)  A SAX Locator 

    the user data (XML parser context) an int 

    the user data (XML parser context) an int 

    the user data (XML parser context) 1 if true 

    the user data (XML parser context) 1 if true 

    the user data (XML parser context) 1 if true 

    the user data (XML parser context)  the root element name  the external ID  the SYSTEM ID (e.g. filename or URL) 

    the user data (XML parser context)  the root element name  the external ID  the SYSTEM ID (e.g. filename or URL) 

    the user data (XML parser context)  The entity name the xmlEntityPtr if found. 

    the user data (XML parser context)  The entity name the xmlEntityPtr if found. 

    the user data (XML parser context)  The public ID of the entity  The system ID of the entity the xmlParserInputPtr if inlined or NULL for DOM behaviour. 

    the user data (XML parser context)  the entity name   the entity type   The public ID of the entity  The system ID of the entity  the entity value (without processing). 

    the user data (XML parser context)  the name of the element  the attribute type   the type of default value  the attribute default value  the tree of enumerated value set 

    the user data (XML parser context)  the element name   the element type   the element value tree 

    the user data (XML parser context)  The name of the notation  The public ID of the entity  The system ID of the entity 

    the user data (XML parser context)  The name of the entity  The public ID of the entity  The system ID of the entity  the name of the notation 

    the user data (XML parser context) 

    the user data (XML parser context) 

    the user data (XML parser context)  The attribute name, including namespace prefix  The attribute value 

    the user data (XML parser context)  The element name, including namespace prefix  An array of name/value attributes pairs, NULL terminated 

    the user data (XML parser context)  The element name 

    the user data (XML parser context)  The entity name 

    the user data (XML parser context)  a xmlChar string  the number of xmlChar 

    the user data (XML parser context)  a xmlChar string  the number of xmlChar 

    the user data (XML parser context)  the target name  the PI data's 

    the user data (XML parser context)  the namespace associated URN  the namespace prefix 

    the user data (XML parser context)  the namespace prefix 

    the user data (XML parser context) the xmlNsPtr or NULL if none 

    the user data (XML parser context)  the namespace to check against 1 if true 0 otherwise 

    the user data (XML parser context)  the namespace associated URN  the namespace prefix 

    the user data (XML parser context)  the comment content 

    the user data (XML parser context)  The pcdata content  the block length 

    Name

    Synopsis

    Description

    Details

    xmlChar

    typedef unsigned char xmlChar;

    This is a basic byte in an UTF-8 encoded string. It's unsigned allowing to pinpoint case where char * are assigned @@ -1934,7 +1921,7 @@ to xmlChar * (possibly making serialization back impossible).

    #define BAD_CAST (xmlChar *)
    #define BAD_CAST

    xmlNotationPtr

    typedef xmlNotation *xmlNotationPtr;

    xmlEnumerationPtr

    typedef xmlEnumeration *xmlEnumerationPtr;

    struct xmlAttribute {
-#ifndef XML_WITHOUT_CORBA
     void           *_private;	        /* for Corba, must be first ! */
-#endif
     xmlElementType          type;       /* XML_ATTRIBUTE_DECL, must be second ! */
     const xmlChar          *name;	/* Attribute name */
     struct _xmlNode    *children;	/* NULL */
@@ -2197,33 +2156,20 @@ CLASS="PROGRAMLISTING"
 >
    xmlAttributePtr
    typedef xmlAttribute *xmlAttributePtr;
    xmlElementContentPtr
    typedef xmlElementContent *xmlElementContentPtr;
    struct xmlElement {
-#ifndef XML_WITHOUT_CORBA
     void           *_private;	        /* for Corba, must be first ! */
-#endif
     xmlElementType          type;       /* XML_ELEMENT_DECL, must be second ! */
     const xmlChar          *name;	/* Element name */
     struct _xmlNode    *children;	/* NULL */
@@ -2430,33 +2361,20 @@ CLASS="PROGRAMLISTING"
 >
    xmlElementPtr
    typedef xmlElement *xmlElementPtr;
    #define XML_LOCAL_NAMESPACE XML_NAMESPACE_DECL
    #define     XML_LOCAL_NAMESPACE
    xmlNsType
    typedef xmlElementType xmlNsType;
    xmlNsPtr
    typedef xmlNs *xmlNsPtr;
    struct xmlDtd {
-#ifndef XML_WITHOUT_CORBA
     void           *_private;	/* for Corba, must be first ! */
-#endif
     xmlElementType  type;       /* XML_DTD_NODE, must be second ! */
     const xmlChar *name;	/* Name of the DTD */
     struct _xmlNode *children;	/* the value of the property link */
@@ -2622,33 +2512,20 @@ the internal subset and for the external subset
    xmlDtdPtr
    typedef xmlDtd *xmlDtdPtr;
    struct xmlAttr {
-#ifndef XML_WITHOUT_CORBA
     void           *_private;	/* for Corba, must be first ! */
-#endif
     xmlElementType   type;      /* XML_ATTRIBUTE_NODE, must be second ! */
     const xmlChar   *name;      /* the name of the property */
     struct _xmlNode *children;	/* the value of the property */
@@ -2690,33 +2565,20 @@ CLASS="PROGRAMLISTING"
 >
    xmlAttrPtr
    typedef xmlAttr *xmlAttrPtr;
    xmlIDPtr
    typedef xmlID *xmlIDPtr;
    xmlRefPtr
    typedef xmlRef *xmlRefPtr;
    xmlBufferPtr
    typedef xmlBuffer *xmlBufferPtr;
    struct xmlNode {
-#ifndef XML_WITHOUT_CORBA
     void           *_private;	/* for Corba, must be first ! */
-#endif
     xmlElementType   type;	/* type number, must be second ! */
     const xmlChar   *name;      /* the name of the node, or the entity */
     struct _xmlNode *children;	/* parent->childs link */
@@ -2973,33 +2794,20 @@ CLASS="PROGRAMLISTING"
 >
    xmlNodePtr
    typedef xmlNode *xmlNodePtr;
    struct xmlDoc {
-#ifndef XML_WITHOUT_CORBA
     void           *_private;	/* for Corba, must be first ! */
-#endif
     xmlElementType  type;       /* XML_DOCUMENT_NODE, must be second ! */
     char           *name;	/* name/filename/URI of the document */
     struct _xmlNode *children;	/* the document tree */
@@ -3053,33 +2859,20 @@ CLASS="PROGRAMLISTING"
 >
    xmlDocPtr
    typedef xmlDoc *xmlDocPtr;
    #define xmlChildrenNode children
    #define     xmlChildrenNode
    #define xmlRootNode children
    #define     xmlRootNode
      allocation method to use 
    the current allocation scheme 
    the new structure. 
     initial size of buffer the new structure. 
      the buffer to resize   the desired size 0 in case of problems, 1 otherwise 
      the buffer to free 
      the file output   the buffer to dump the number of xmlChar written 
      the buffer to dump   the xmlChar string   the number of xmlChar to add 
      the buffer   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   the minimum free size to allocate the new available space or -1 in case of error 
      the buffer 
      the buffer the internal content 
      the buffer to free   allocation scheme to use 
      the buffer  the length of data in the internal content 
      the document pointer   the DTD name   the external (PUBLIC) 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 document pointer a pointer to the DTD structure or NULL if not found 
      the DTD structure to free up 
      the document carrying the namespace   the URI associated   the prefix for the namespace NULL this functionnality had been removed 
      the element carrying the namespace   the URI associated   the prefix for the namespace returns a new namespace pointer or NULL 
      the namespace pointer 
      the first 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 
      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. 
      the document   namespace if any   the node name   the XML text content if any a pointer to the new node object. 
      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. 
      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. 
      the parent node   a namespace if any   the name of the child   the text content of the child if any. 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 char ref string, starting with # or "&# ... ;" 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 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. 
      the document owning the fragment a pointer to the new node object. 
      the document the xmlNodePtr for the root or NULL 
      the parent node the last child or NULL if none. 
      the node 1 yes, 0 no 
      the node 1 yes, 0 no 
      the document   the new document root element the old root element if any was found 
      the node being changed   the new tag name 
      the parent node   the child node the child or NULL in case of error. 
      the parent node   the first node in the list the last child or NULL in case of error. 
      the old node   the node the old node 
      the child node   the new node the new element or NULL in case of error. 
      the child node   the new node the new element or NULL in case of error. 
      the child node   the new node 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 
      the top element   the document 
      the document 
      the document   the current node   the namespace prefix 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. 
      the node   the attribute name the attribute value or NULL if not found.
-It's up to the caller to free the memory. 
      the node   the attribute name the attribute or the attribute declaration or NULL if 
-neither was found. 
      the node   the attribute name   the URI of the namespace the attribute or the attribute declaration or NULL
-if neither was found. 
      the node   the namespace definition   the attribute name   the attribute value the attribute pointer. 
      the node   the attribute name   the URI of the namespace 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 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. 
      the node being changed   the langage description 
      the node being checked -1 if xml:space is not inheried, 0 if "default", 1 if "preserve" 
      the node being changed 
      the document the node pertains to   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 node being changed   the new base URI 
    0 if success and -1 in case of error. 
      the node   the attribute name 0 if successful, -1 if not found 
      the node   the namespace definition   the attribute name 0 if successful, -1 if not found 
      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   a node defining the subtree to reconciliate the number of namespace declarations created or -1 in case of error. 
    cur : 
    mem : 
    size : 
    format : 
    xmlDocDumpMemory ()
    void        xmlDocDumpMemory                (xmlDocPtr cur,
+                                             xmlChar **mem,
+                                             int *size);
    Dump an XML document in memory and return the xmlChar * and it's size.
+It's up to the caller to free the memory.
      the document   OUT: the memory pointer   OUT: the memory lenghtformat :  should formatting spaces been added 
    xmlDocDumpMemory ()
    void        xmlDocDumpMemory                (xmlDocPtr cur,
-                                             xmlChar **mem,
-                                             int *size);
    Dump an XML document in memory and return the xmlChar * and it's size.
-It's up to the caller to free the memory.
    cur :  the document
    mem :  OUT: the memory pointer
    size :  OUT: the memory lenght
      Document to generate XML text from   Memory pointer for allocated XML text   Length of the generated XML text   Character encoding to use when generating XML text 
      the FILE*   the document  the number of byte written or -1 in case of failure. 
      the FILE * for the output   the document   the current node 
      the filename (or URL)   the document  the number of byte written or -1 in case of failure. 
      the filename (or URL)   the document   should formatting spaces been added  the number of byte written or -1 in case of failure. 
      the XML buffer output   the document   the current node  the imbrication level for indenting  is formatting allowed 
      the filename (or URL)   the document   the name of an encoding (or NULL)  the number of byte 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 
    Name
    Synopsis
    Description
    Details
    Name
    Synopsis
    Description
    Details
    xmlValidStatePtr
    typedef xmlValidState *xmlValidStatePtr;
    xmlValidCtxtPtr
    typedef xmlValidCtxt *xmlValidCtxtPtr;
    xmlNotationTablePtr
    typedef xmlNotationTable *xmlNotationTablePtr;
    xmlElementTablePtr
    typedef xmlElementTable *xmlElementTablePtr;
    xmlAttributeTablePtr
    typedef xmlAttributeTable *xmlAttributeTablePtr;
    xmlIDTablePtr
    typedef xmlIDTable *xmlIDTablePtr;
    xmlRefTablePtr
    typedef xmlRefTable *xmlRefTablePtr;
      an XML parser context   a xmlChar **  NULL if not a QName, otherwise the local part, and prefix
-is updated to get the Prefix if any. 
      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 declaration 
      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 
      an output buffer   An element table  1 if one must print the englobing parenthesis, 0 otherwise 
      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 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 namespace prefix   the attribute type   the attribute default type   the attribute default value   if it's an enumeration, the associated list NULL if not new, othervise the attribute decl 
      An attribute table the new xmlAttributeTablePtr or NULL in case of error. 
      An attribute table 
      the XML buffer output   An attribute table 
      the XML buffer output   An attribute declaration 
      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 document   the attribute -1 if the lookup failed and 0 otherwise 
      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 document   the attribute -1 if the lookup failed and 0 otherwise 
      pointer to the document   the ID value NULL if not found, otherwise node set for the ID. 
      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 document   the parent   the attribute name   the attribute value a new normalized string if normalization is needed, NULL otherwise
-the caller must free the returned value. 
      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 
      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 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. 
    Name
    Synopsis
    Description
    Details
     an XML document 0 if no substition were done, -1 if some processing failed
-or the number of substitutions done. 
    Name
    Synopsis
    Description
    Details
      the new error handling context   the new handler function 
      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 
    Name
    Synopsis
    Description
    Details
    xmlParserInputBufferPtr
    typedef xmlParserInputBuffer *xmlParserInputBufferPtr;
    xmlOutputBufferPtr
    typedef xmlOutputBuffer *xmlOutputBufferPtr;
      the charset encoding if known the new parser input or NULL 
      a C string containing the URI or filename   the charset encoding if known the new parser input or NULL 
      a FILE*    the charset encoding if known the new parser input or NULL 
      a file descriptor number   the charset encoding if known the new parser input or NULL 
      the memory input   the length of the memory block   the charset encoding if known the new parser input or NULL 
      an I/O read function   an I/O close function   an I/O handler   the charset encoding if known the new parser input or NULL 
      a buffered parser input   indicative value of the amount of chars to read the number of chars read and stored in the buffer, or -1
-in case of error. 
      a buffered parser input   indicative value of the amount of chars to read the number of chars read and stored in the buffer, or -1
-in case of error. 
      a buffered parser input   the size in bytes of the array.   an char array the number of chars read and stored in the buffer, or -1
-in case of error. 
      a buffered parser input 
      the xmlInputMatchCallback   the xmlInputOpenCallback   the xmlInputReadCallback   the xmlInputCloseCallback the registered handler number or -1 in case of error 
      the encoding converter or NULL the new parser output or NULL 
      a C string containing the URI or filename   the encoding converter or NULL   the compression ration (0 none, 9 max). the new output or NULL 
      a FILE*    the encoding converter or NULL the new parser output or NULL 
      a file descriptor number   the encoding converter or NULL the new parser output or NULL 
      an I/O write function   an I/O close function   an I/O handler the new parser output or NULL 
      a buffered parser output   the size in bytes of the array.   an char array the number of chars immediately written, or -1
-in case of error. 
      a buffered parser output   a zero terminated C string the number of chars immediately written, or -1
-in case of error. 
      a buffered output the number of byte written or -1 in case of error. 
      a buffered output the number of byte written or -1 in case of error. 
      the xmlOutputMatchCallback   the xmlOutputOpenCallback   the xmlOutputWriteCallback   the xmlOutputCloseCallback the registered handler number or -1 in case of error 
      an output I/O buffer   the document   the encoding if any assuming the i/O layer handles the trancoding  the number of byte written or -1 in case of failure. 
      an output I/O buffer   the document   the encoding if any assuming the i/O layer handles the trancoding  should formatting spaces been added  the number of byte written or -1 in case of failure. 
      the XML buffer output   the document   the current node  the imbrication level for indenting  is formatting allowed   an optional encoding string 
      the HTML buffer output   the document   the encoding string 
    Name
    Synopsis
    Description
    Details
    #define DEBUG_MEMORY
    #define     DEBUG_MEMORY
    #define MEM_LIST /* keep a list of all the allocated memory blocks */
    #define     MEM_LIST
     the free() function to use  the malloc() function to use  the realloc() function to use  the strdup() function to use 0 on success 
     the free() function in use  the malloc() function in use  the realloc() function in use  the strdup() function in use 0 on success 
    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 
      a FILE descriptor used as the output file   number of entries to dump 
    #define xmlMalloc(x) xmlMallocLoc((x), __FILE__, __LINE__)
    #define     xmlMalloc(x)

    #define xmlRealloc(p, x) xmlReallocLoc((p), (x), __FILE__, __LINE__)
    #define xmlRealloc(p, x)

    #define xmlMemStrdup(x) xmlMemStrdupLoc((x), __FILE__, __LINE__)
    #define xmlMemStrdup(x)

    an int specifying the size in byte to allocate.  the file name or NULL  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 number a pointer to the new string or NULL if allocation error occured. 

    Name

    Synopsis

    Description

    Details

    xmlXPathContextPtr

    typedef xmlXPathContext *xmlXPathContextPtr;

    xmlXPathParserContextPtr

    typedef xmlXPathParserContext *xmlXPathParserContextPtr;

    xmlNodeSetPtr

    typedef xmlNodeSet *xmlNodeSetPtr;

    xmlXPathTypePtr

    typedef xmlXPathType *xmlXPathTypePtr;

    xmlXPathVariablePtr

    typedef xmlXPathVariable *xmlXPathVariablePtr;

    xmlXPathFuncPtr

    typedef xmlXPathFunct *xmlXPathFuncPtr;

    xmlXPathAxisPtr

    typedef xmlXPathAxis *xmlXPathAxisPtr;

    xmlXPathCompExprPtr

    typedef xmlXPathCompExpr *xmlXPathCompExprPtr;

    #define xmlXPathNodeSetGetLength(ns) ((ns) ? (ns)->nodeNr : 0)
    #define xmlXPathNodeSetGetLength(ns)

    the object to free 

    an initial xmlNodePtr, or NULL the newly created object. 

    an existing NodeSetList object 

    the xmlNodeSetPtr to free 

    the original object the newly created object. 

    the first node  the second node -2 in case of error 1 if first point < second point, 0 if -that's the same node, -1 otherwise 

    a number the boolean value 

    a string the boolean value 

    a node-set the boolean value 

    a boolean the number value 

    a string the number value 

    a node the number value 

    a node-set the number value 

    an XPath object the number value 

    a boolean a newly allocated string. 

    a number a newly allocated string. 

    a node a newly allocated string. 

    a node-set a newly allocated string. 

    val : 
    Returns : 

    xmlXPathConvertBoolean ()

    xmlXPathObjectPtr xmlXPathConvertBoolean    (xmlXPathObjectPtr val);

    Converts an existing object to its boolean() equivalent

    val : 
    Returns : 

    xmlXPathConvertNumber ()

    xmlXPathObjectPtr xmlXPathConvertNumber     (xmlXPathObjectPtr val);

    Converts an existing object to its number() equivalent

    val : 
    Returns : 

    xmlXPathConvertString ()

    xmlXPathObjectPtr xmlXPathConvertString     (xmlXPathObjectPtr val);

    Converts an existing object to its string() equivalent

    an XPath object the string value of the object, NULL in case of error. -A new string is allocated only if needed (val isn't a -string object). 

    xmlXPathConvertBoolean ()

    xmlXPathObjectPtr xmlXPathConvertBoolean    (xmlXPathObjectPtr val);

    Converts an existing object to its boolean() equivalent

    val : an XPath object
    Returns :the new object, the old one is freed (or the operation -is done directly on val)

    xmlXPathConvertNumber ()

    xmlXPathObjectPtr xmlXPathConvertNumber     (xmlXPathObjectPtr val);

    Converts an existing object to its number() equivalent

    val : an XPath object
    Returns :the new object, the old one is freed (or the operation -is done directly on val)

    xmlXPathConvertString ()

    xmlXPathObjectPtr xmlXPathConvertString     (xmlXPathObjectPtr val);

    Converts an existing object to its string() equivalent

    val : an XPath object
    Returns :the new object, the old one is freed (or the operation -is done directly on val)

    xmlXPathInit ()

    the XML document the xmlXPathContext just allocated. 

    the context to free 

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

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

    the XPath context  the Predicate Expression evaluation result 

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

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

    an XPATH comp 

    Name

    Synopsis

    Description

    Details

    the error code 

    the error code 

    the XPath type 

    the number of expected args 

    the XPath context  the lookup function 

    the FILE * to dump the output  the object to inspect  indentation level 

    the XPath context  the namespace prefix  the namespace name 0 in case of success, -1 in case of error 

    the XPath context the value or NULL if not found 

    the XPath context  the function name  the function implementation or NULL 0 in case of success, -1 in case of error 

    the XPath context  the function name  the function namespace URI  the function implementation or NULL 0 in case of success, -1 in case of error 

    the XPath context  the variable name  the variable value or NULL 0 in case of success, -1 in case of error 

    the XPath context  the variable name  the variable namespace URI  the variable value or NULL 0 in case of success, -1 in case of error 

    the XPath context  the function name the xmlXPathFunction or NULL if not found 

    the XPath context  the function name  the function namespace URI the xmlXPathFunction or NULL if not found 

    the XPath context 

    the XPath context  the variable name the value or NULL if not found 

    the XPath context  the variable name  the variable namespace URI the value or NULL if not found 

    the XPath context 

    the XPath expression  the XPath context the xmlXPathParserContext just allocated. 

    the context to free 

    the xmlChar * value the newly created object. 

    the char * value the newly created object. 

    the xmlChar * value the newly created object. 

    the char * value the newly created object. 

    the double value the newly created object. 

    the boolean value the newly created object. 

    the NodePtr value the newly created object. 

    the NodePtr value the newly created object. 

    the initial node set  a new xmlNodePtr 

    the initial node set  a new xmlNodePtr 

    the node set 

    the XPath Parser context  the number of arguments 

    the XPath Parser context 

    the XPath Parser context 

    the XPath Parser context the namespace name or NULL 

    the XPath Parser context the namespace name or NULL 

    A string to scan the double value. 

    the XPath Parser context  the Predicate Expression evaluation result 

    the XPath Parser context  the number of arguments 

    the XPath context 

    the first NodeSet or NULL  the second NodeSet val1 once extended or NULL in case of error. 

    the initial node set  an xmlNodePtr 

    the initial node set  the index to remove 

    an existing NodeSet the newly created object. 

    the NodePtr value the newly created object. 

    the XPath Parser context 0 or 1 depending on the results of the test. 

    the XPath Parser context  less than (1) or greater than (0)  is the comparison strict 1 if the comparaison succeeded, 0 if it failed 

    the XPath Parser context 

    the XPath Parser context 

    the XPath Parser context 

    the XPath Parser context 

    the XPath Parser context 

    the XPath Parser context 

    a name string 1 if true 0 otherwise 

    the XPath Parser context  the current node in the traversal the next element following that axis 

    the XPath Parser context  the current node in the traversal the next element following that axis 

    the XPath Parser context  the current node in the traversal the next element following that axis 

    the XPath Parser context  the current node in the traversal the next element following that axis 

    the XPath Parser context  the current node in the traversal the next element following that axis 

    the XPath Parser context  the current node in the traversal the next element following that axis 

    the XPath Parser context  the current node in the traversal the next element following that axis 

    the XPath Parser context  the current node in the traversal the next element following that axis 

    the XPath Parser context  the current attribute in the traversal the next element following that axis 

    the XPath Parser context  the current attribute in the traversal the next element following that axis 

    the XPath Parser context  the current node in the traversal the next element following that axis 

    the XPath Parser context  the current node in the traversal the next element following that axis 

    the XPath Parser context  the current node in the traversal the next element following that axis 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    the XPath Parser context  the number of arguments 

    Name

    Synopsis

    Description

    Details

    xmlLocationSetPtr

    typedef xmlLocationSet *xmlLocationSetPtr;

    an initial xmlXPathObjectPtr, or NULL the newly created object. 

    the xmlLocationSetPtr to free 

    the first LocationSet  the second LocationSet val1 once extended or NULL in case of error. 

    the starting node  the start index  the ending point  the ending index the newly created object. 

    the starting point  the ending point the newly created object. 

    the starting node  the ending point the newly created object. 

    the starting point  the ending node the newly created object. 

    the starting node  the ending node the newly created object. 

    the start NodePtr value  the end NodePtr value or NULL the newly created object. 

    a node set the newly created object. 

    the starting node  the ending object the newly created object. 

    the starting and ending node the newly created object. 

    the initial range set  a new xmlXPathObjectPtr 

    the LocationSet value the newly created object. 

    the initial range set  an xmlXPathObjectPtr 

    the initial range set  the index to remove 

    the XML document  the node that directly contains the XPointer being evaluated or NULL  the element from which a user or program initiated traversal of -the link, or NULL. the xmlXPathContext just allocated. 

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

    the XPointer Parser context  the number of args 

    Build a node list tree copy of the XPointer result.

    Build a node list tree copy of the XPointer result. +This will drop Attributes and Namespace declarations.

    the XPointer result from the evaluation. an xmlNodePtr list or NULL. -the caller has to free the node tree. 

    the XPointer Parser context  -

    Daniel Veillard

    +

    Daniel Veillard

    -

    $Id: upgrade.html,v 1.7 2000/06/30 18:39:56 veillard Exp $

    +

    $Id: upgrade.html,v 1.8 2001/03/16 22:04:15 veillard Exp $

    diff --git a/doc/xml.html b/doc/xml.html index cfcc402b..20d771cc 100644 --- a/doc/xml.html +++ b/doc/xml.html @@ -1549,7 +1549,9 @@ Gnome CVS base under gnome-xml/example

  • David Doolin provides a precompiled Windows version

    http://www.ce.berkeley.edu/~doolin/code/libxmlwin32/

    + href="http://www.ce.berkeley.edu/~doolin/code/libxmlwin32/">http://www.ce.berkeley.edu/~doolin/code/libxmlwin32/ + (older). The distribution now includes projects and makefiles for Windows + compiler contributed by various people.

  • Matt @@ -1557,19 +1559,21 @@ Gnome CVS base under gnome-xml/example

    href="http://axkit.org/download/">XML::LibXSLT    , a perl wrapper for libxml2/libxslt as part of the AxKit XML application server
    • -
  • Felix Natter and - Geert Kloosterman provide Felix Natter and Geert Kloosterman provide an emacs module to lookup libxml(2) functions documentation
  • Ziying Sherwin provided man pages (not yet - integrated in the distribution)
    • + href="http://xmlsoft.org/messages/0488.html">man pages +
  • Seems ArsDigita wrote a Tcl + wrapper for libxml called ns_xml

    • Daniel Veillard

    -

    $Id: xml.html,v 1.89 2001/06/22 16:03:51 veillard Exp $

    +

    $Id: xml.html,v 1.90 2001/06/23 17:39:29 veillard Exp $

    diff --git a/doc/xmldtd.html b/doc/xmldtd.html index c0920adf..7477d230 100644 --- a/doc/xmldtd.html +++ b/doc/xmldtd.html @@ -198,7 +198,7 @@ will just list one for now, others pointers welcome:

    -

    Daniel Veillard

    +

    Daniel Veillard

    $Id$

    diff --git a/doc/xmlio.html b/doc/xmlio.html index 52cf60b4..1faf3f94 100644 --- a/doc/xmlio.html +++ b/doc/xmlio.html @@ -18,7 +18,7 @@ href="http://xmlsoft.org/xmlio.html">http://xmlsoft.org/xmlio.html

    Mailing-list archive: http://xmlsoft.org/messages/

    -

    Version: $Revision: 1.3 $

    +

    Version: $Revision: 1.4 $

    Table of Content:

      @@ -194,8 +194,8 @@ res = xmlSaveFileTo(output, doc, NULL);
    -

    Daniel Veillard

    +

    Daniel Veillard

    -

    $Id: xmlio.html,v 1.3 2000/08/31 14:57:50 veillard Exp $

    +

    $Id: xmlio.html,v 1.4 2001/01/29 08:22:12 veillard Exp $

    diff --git a/doc/xmlmem.html b/doc/xmlmem.html index 0ec47fbc..e16e69ac 100644 --- a/doc/xmlmem.html +++ b/doc/xmlmem.html @@ -153,7 +153,7 @@ a number of things:

    -

    Daniel Veillard

    +

    Daniel Veillard

    $Id$

    diff --git a/encoding.c b/encoding.c index b7611c29..4b08ab15 100644 --- a/encoding.c +++ b/encoding.c @@ -15,7 +15,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com * * UTF8 string routines from: * "William M. Brack" diff --git a/entities.c b/entities.c index 23a9de18..94f1f6ff 100644 --- a/entities.c +++ b/entities.c @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #include "libxml.h" diff --git a/error.c b/error.c index 01b49ff3..52354503 100644 --- a/error.c +++ b/error.c @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel Veillard + * Daniel Veillard */ #include "libxml.h" diff --git a/include/libxml/DOCBparser.h b/include/libxml/DOCBparser.h index a1aeea26..24b99b7d 100644 --- a/include/libxml/DOCBparser.h +++ b/include/libxml/DOCBparser.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #ifndef __DOCB_PARSER_H__ diff --git a/include/libxml/HTMLparser.h b/include/libxml/HTMLparser.h index e7949189..575360c8 100644 --- a/include/libxml/HTMLparser.h +++ b/include/libxml/HTMLparser.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #ifndef __HTML_PARSER_H__ diff --git a/include/libxml/HTMLtree.h b/include/libxml/HTMLtree.h index bd3a2fb2..036f4b3a 100644 --- a/include/libxml/HTMLtree.h +++ b/include/libxml/HTMLtree.h @@ -4,7 +4,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #ifndef __HTML_TREE_H__ diff --git a/include/libxml/Makefile.am b/include/libxml/Makefile.am index 769d2e53..e7d91c58 100644 --- a/include/libxml/Makefile.am +++ b/include/libxml/Makefile.am @@ -27,10 +27,11 @@ xmlinc_HEADERS = \ valid.h \ xlink.h \ xmlversion.h \ + xmlwin32version.h \ DOCBparser.h \ catalog.h install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(xmlincdir) $(DESTDIR)$(xmlincdir)/libxml -EXTRA_DIST = xmlversion.h.in +EXTRA_DIST = xmlversion.h.in xmlwin32version.h.in diff --git a/include/libxml/SAX.h b/include/libxml/SAX.h index 16734759..aad01b88 100644 --- a/include/libxml/SAX.h +++ b/include/libxml/SAX.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel Veillard + * Daniel Veillard */ diff --git a/include/libxml/catalog.h b/include/libxml/catalog.h index 88175e14..16b0f67f 100644 --- a/include/libxml/catalog.h +++ b/include/libxml/catalog.h @@ -9,7 +9,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #ifndef __XML_CATALOG_H__ @@ -17,7 +17,11 @@ #include +#if defined(WIN32) && defined(_MSC_VER) +#include +#else #include +#endif #ifdef LIBXML_CATALOG_ENABLED #ifdef __cplusplus diff --git a/include/libxml/debugXML.h b/include/libxml/debugXML.h index babb8acb..6ed6ef91 100644 --- a/include/libxml/debugXML.h +++ b/include/libxml/debugXML.h @@ -2,7 +2,7 @@ * debugXML.h : Interfaces to a set of routines used for debugging the tree * produced by the XML parser. * - * Daniel Veillard + * Daniel Veillard */ #ifndef __DEBUG_XML__ diff --git a/include/libxml/encoding.h b/include/libxml/encoding.h index fc1760e3..c20fbcee 100644 --- a/include/libxml/encoding.h +++ b/include/libxml/encoding.h @@ -15,13 +15,17 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #ifndef __XML_CHAR_ENCODING_H__ #define __XML_CHAR_ENCODING_H__ +#if defined(WIN32) && defined(_MSC_VER) +#include +#else #include +#endif #ifdef LIBXML_ICONV_ENABLED #include #endif diff --git a/include/libxml/entities.h b/include/libxml/entities.h index 33270655..33d3fcf5 100644 --- a/include/libxml/entities.h +++ b/include/libxml/entities.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #ifndef __XML_ENTITIES_H__ diff --git a/include/libxml/nanoftp.h b/include/libxml/nanoftp.h index cf334201..975f6f45 100644 --- a/include/libxml/nanoftp.h +++ b/include/libxml/nanoftp.h @@ -3,13 +3,17 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #ifndef __NANO_FTP_H__ #define __NANO_FTP_H__ +#if defined(WIN32) && defined(_MSC_VER) +#include +#else #include +#endif #ifdef LIBXML_FTP_ENABLED #ifdef __cplusplus diff --git a/include/libxml/nanohttp.h b/include/libxml/nanohttp.h index 6738f8a4..9e255bd4 100644 --- a/include/libxml/nanohttp.h +++ b/include/libxml/nanohttp.h @@ -3,13 +3,17 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #ifndef __NANO_HTTP_H__ #define __NANO_HTTP_H__ +#if defined(WIN32) && defined(_MSC_VER) +#include +#else #include +#endif #ifdef LIBXML_HTTP_ENABLED #ifdef __cplusplus diff --git a/include/libxml/parser.h b/include/libxml/parser.h index da404e77..5ff8ab65 100644 --- a/include/libxml/parser.h +++ b/include/libxml/parser.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #ifndef __XML_PARSER_H__ diff --git a/include/libxml/parserInternals.h b/include/libxml/parserInternals.h index a7757899..e9b6bb46 100644 --- a/include/libxml/parserInternals.h +++ b/include/libxml/parserInternals.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com * * 14 Nov 2000 ht - truncated declaration of xmlParseElementChildrenContentDecl * for VMS diff --git a/include/libxml/tree.h b/include/libxml/tree.h index 814c9047..9e4c3f85 100644 --- a/include/libxml/tree.h +++ b/include/libxml/tree.h @@ -4,7 +4,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com * * 14 Nov 2000 ht - added redefinition of xmlBufferWriteChar for VMS * @@ -14,7 +14,11 @@ #define __XML_TREE_H__ #include +#if defined(WIN32) && defined(_MSC_VER) +#include +#else #include +#endif #include #ifdef __cplusplus diff --git a/include/libxml/uri.h b/include/libxml/uri.h index 874151c4..e4bbbe8a 100644 --- a/include/libxml/uri.h +++ b/include/libxml/uri.h @@ -5,7 +5,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #ifndef __XML_URI_H__ diff --git a/include/libxml/valid.h b/include/libxml/valid.h index c048ba0e..01d18737 100644 --- a/include/libxml/valid.h +++ b/include/libxml/valid.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ diff --git a/include/libxml/xinclude.h b/include/libxml/xinclude.h index eca4588c..9c83ba0e 100644 --- a/include/libxml/xinclude.h +++ b/include/libxml/xinclude.h @@ -6,7 +6,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #ifndef __XML_XINCLUDE_H__ diff --git a/include/libxml/xlink.h b/include/libxml/xlink.h index dbe228b3..6d27166f 100644 --- a/include/libxml/xlink.h +++ b/include/libxml/xlink.h @@ -7,7 +7,7 @@ * http://www.w3.org/HTML/ * and XBase * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #ifndef __XML_XLINK_H__ diff --git a/include/libxml/xmlIO.h b/include/libxml/xmlIO.h index ae7b76fb..422dce46 100644 --- a/include/libxml/xmlIO.h +++ b/include/libxml/xmlIO.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com * * 15 Nov 2000 ht - modified for VMS */ diff --git a/include/libxml/xmlmemory.h b/include/libxml/xmlmemory.h index bd82c6d2..90a1274a 100644 --- a/include/libxml/xmlmemory.h +++ b/include/libxml/xmlmemory.h @@ -1,7 +1,7 @@ /* * xmlmemory.h: interface for the memory allocation debug. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ @@ -9,7 +9,11 @@ #define _DEBUG_MEMORY_ALLOC_ #include +#if defined(WIN32) && defined(_MSC_VER) +#include +#else #include +#endif /** * DEBUG_MEMORY: diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in index 1c6bdb00..7244d6fb 100644 --- a/include/libxml/xmlversion.h.in +++ b/include/libxml/xmlversion.h.in @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #ifndef __XML_VERSION_H__ diff --git a/include/libxml/xmlversion.h b/include/libxml/xmlwin32version.h similarity index 85% rename from include/libxml/xmlversion.h rename to include/libxml/xmlwin32version.h index f188e803..ff63e78e 100644 --- a/include/libxml/xmlversion.h +++ b/include/libxml/xmlwin32version.h @@ -1,9 +1,10 @@ /* - * xmlversion.h : compile-time version informations for the XML parser. + * xmlwin32version.h : compile-time version informations for the XML parser + * when compiled on the Windows platform * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #ifndef __XML_VERSION_H__ @@ -17,9 +18,6 @@ extern "C" { * use those to be sure nothing nasty will happen if * your library and includes mismatch */ -#ifndef LIBXML2_COMPILING_MSCCDEF -extern void xmlCheckVersion(int version); -#endif /* LIBXML2_COMPILING_MSCCDEF */ #define LIBXML_DOTTED_VERSION "2.3.11" #define LIBXML_VERSION 20311 #define LIBXML_VERSION_STRING "20311" @@ -85,7 +83,7 @@ extern void xmlCheckVersion(int version); * * Whether the SGML Docbook support is configured in */ -#if 1 +#if 0 #define LIBXML_DOCB_ENABLED #else #define LIBXML_DOCB_DISABLED @@ -129,7 +127,7 @@ extern void xmlCheckVersion(int version); * * Whether iconv support is available */ -#if !defined(WIN32) || defined(__CYGWIN__) +#if defined(__CYGWIN__) #if 1 #define LIBXML_ICONV_ENABLED #else @@ -158,7 +156,7 @@ extern void xmlCheckVersion(int version); #endif #ifndef LIBXML_DLL_IMPORT -#if defined(WIN32) && !defined(STATIC) +#if !defined(STATIC) #define LIBXML_DLL_IMPORT __declspec(dllimport) #else #define LIBXML_DLL_IMPORT @@ -169,17 +167,9 @@ extern void xmlCheckVersion(int version); * ATTRIBUTE_UNUSED: * * Macro used to signal to GCC unused function parameters + * Disabled on Windows, this is checked on Linux. */ -#ifdef __GNUC__ -#ifdef HAVE_ANSIDECL_H -#include -#endif -#ifndef ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED -#endif -#else -#define ATTRIBUTE_UNUSED -#endif #ifdef __cplusplus } diff --git a/include/libxml/xmlwin32version.h.in b/include/libxml/xmlwin32version.h.in new file mode 100644 index 00000000..7972c98f --- /dev/null +++ b/include/libxml/xmlwin32version.h.in @@ -0,0 +1,179 @@ +/* + * xmlwin32version.h : compile-time version informations for the XML parser + * when compiled on the Windows platform + * + * See Copyright for the status of this software. + * + * daniel@veillard.com + */ + +#ifndef __XML_VERSION_H__ +#define __XML_VERSION_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * use those to be sure nothing nasty will happen if + * your library and includes mismatch + */ +#define LIBXML_DOTTED_VERSION "@VERSION@" +#define LIBXML_VERSION @LIBXML_VERSION_NUMBER@ +#define LIBXML_VERSION_STRING "@LIBXML_VERSION_NUMBER@" +#define LIBXML_TEST_VERSION xmlCheckVersion(@LIBXML_VERSION_NUMBER@); + +/** + * WITH_TRIO: + * + * Whether the trio support need to be configured in + */ +#if 0 +#define WITH_TRIO +#else +#define WITHOUT_TRIO +#endif + +/** + * LIBXML_FTP_ENABLED: + * + * Whether the FTP support is configured in + */ +#if 1 +#define LIBXML_FTP_ENABLED +#else +#define LIBXML_FTP_DISABLED +#endif + +/** + * LIBXML_HTTP_ENABLED: + * + * Whether the HTTP support is configured in + */ +#if 1 +#define LIBXML_HTTP_ENABLED +#else +#define LIBXML_HTTP_DISABLED +#endif + +/** + * LIBXML_HTML_ENABLED: + * + * Whether the HTML support is configured in + */ +#if 1 +#define LIBXML_HTML_ENABLED +#else +#define LIBXML_HTML_DISABLED +#endif + +/** + * LIBXML_CATALOG_ENABLED: + * + * Whether the Catalog support is configured in + */ +#if 1 +#define LIBXML_CATALOG_ENABLED +#else +#define LIBXML_CATALOG_DISABLED +#endif + +/** + * LIBXML_DOCB_ENABLED: + * + * Whether the SGML Docbook support is configured in + */ +#if 0 +#define LIBXML_DOCB_ENABLED +#else +#define LIBXML_DOCB_DISABLED +#endif + +/** + * LIBXML_XPATH_ENABLED: + * + * Whether XPath is configured in + */ +#if 1 +#define LIBXML_XPATH_ENABLED +#else +#define LIBXML_XPATH_DISABLED +#endif + +/** + * LIBXML_XPTR_ENABLED: + * + * Whether XPointer is configured in + */ +#if 1 +#define LIBXML_XPTR_ENABLED +#else +#define LIBXML_XPTR_DISABLED +#endif + +/** + * LIBXML_XINCLUDE_ENABLED: + * + * Whether XInclude is configured in + */ +#if 1 +#define LIBXML_XINCLUDE_ENABLED +#else +#define LIBXML_XINCLUDE_DISABLED +#endif + +/** + * LIBXML_ICONV_ENABLED: + * + * Whether iconv support is available + */ +#if defined(__CYGWIN__) +#if @WITH_ICONV@ +#define LIBXML_ICONV_ENABLED +#else +#define LIBXML_ICONV_DISABLED +#endif +#endif + +/** + * LIBXML_DEBUG_ENABLED: + * + * Whether Debugging module is configured in + */ +#if 1 +#define LIBXML_DEBUG_ENABLED +#else +#define LIBXML_DEBUG_DISABLED +#endif + +/** + * DEBUG_MEMORY_LOCATION: + * + * Whether the memory debugging is configured in + */ +#if 0 +#define DEBUG_MEMORY_LOCATION +#endif + +#ifndef LIBXML_DLL_IMPORT +#if !defined(STATIC) +#define LIBXML_DLL_IMPORT __declspec(dllimport) +#else +#define LIBXML_DLL_IMPORT +#endif +#endif + +/** + * ATTRIBUTE_UNUSED: + * + * Macro used to signal to GCC unused function parameters + * Disabled on Windows, this is checked on Linux. + */ +#define ATTRIBUTE_UNUSED + +#ifdef __cplusplus +} +#endif /* __cplusplus */ +#endif + + diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h index 1c1b1452..a330e385 100644 --- a/include/libxml/xpath.h +++ b/include/libxml/xpath.h @@ -6,7 +6,7 @@ * * See COPYRIGHT for the status of this software * - * Author: Daniel.Veillard@w3.org + * Author: daniel@veillard.com */ #ifndef __XML_XPATH_H__ diff --git a/include/libxml/xpathInternals.h b/include/libxml/xpathInternals.h index 557b8e9d..7f3f75e7 100644 --- a/include/libxml/xpathInternals.h +++ b/include/libxml/xpathInternals.h @@ -4,13 +4,17 @@ * * See COPYRIGHT for the status of this software * - * Author: Daniel.Veillard@w3.org + * Author: daniel@veillard.com */ #ifndef __XML_XPATH_INTERNALS_H__ #define __XML_XPATH_INTERNALS_H__ +#if defined(WIN32) && defined(_MSC_VER) +#include +#else #include +#endif #include #ifdef __cplusplus diff --git a/include/libxml/xpointer.h b/include/libxml/xpointer.h index 45efd791..a81eacb6 100644 --- a/include/libxml/xpointer.h +++ b/include/libxml/xpointer.h @@ -6,7 +6,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #ifndef __XML_XPTR_H__ diff --git a/libxml.4 b/libxml.4 index 5aa868f3..6b8f5ce9 100644 --- a/libxml.4 +++ b/libxml.4 @@ -58,7 +58,7 @@ shareable library .B /depot/package/libxml_2.0.0/bin/xmllint binary application for parsing XML files .SH AUTHORS -Daniel Veillard (Daniel.Veillard@w3.org). +Daniel Veillard (daniel@veillard.com). If you download and install this package please send the author email. Manual page by Ziying Sherwin (sherwin@nlm.nih.gov), Lister Hill National Center for Biomedical Communications, diff --git a/libxml.spec.in b/libxml.spec.in index 9c341e44..56aadadf 100644 --- a/libxml.spec.in +++ b/libxml.spec.in @@ -53,19 +53,19 @@ URI library. - Moved the man pages from /usr/man to /usr/share/man to conform to FHS2.0 - Moved programmer documentation into the devel package -* Thu Sep 23 1999 Daniel Veillard +* Thu Sep 23 1999 Daniel Veillard - corrected the spec file alpha stuff - switched to version 1.7.1 - Added validation, XPath, nanohttp, removed memory leaks - Renamed CHAR to xmlChar -* Wed Jun 2 1999 Daniel Veillard +* Wed Jun 2 1999 Daniel Veillard - Switched to version 1.1: SAX extensions, better entities support, lots of bug fixes. -* Sun Oct 4 1998 Daniel Veillard +* Sun Oct 4 1998 Daniel Veillard - Added xml-config to the package diff --git a/nanoftp.c b/nanoftp.c index 69ff6bf0..c6fb7d2d 100644 --- a/nanoftp.c +++ b/nanoftp.c @@ -12,7 +12,7 @@ #define HAVE_NETINET_IN_H #define HAVE_NETDB_H #define HAVE_SYS_TIME_H -#include +#include "libxml.h" #ifdef WITHOUT_TRIO #include #else diff --git a/nanohttp.c b/nanohttp.c index 4991e0bb..75e95b58 100644 --- a/nanohttp.c +++ b/nanohttp.c @@ -8,7 +8,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ /* TODO add compression support, Send the Accept- , and decompress on the diff --git a/parser.c b/parser.c index f1e90ca3..3ae7ba48 100644 --- a/parser.c +++ b/parser.c @@ -27,7 +27,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com * * 14 Nov 2000 ht - truncated definitions of xmlSubstituteEntitiesDefaultValue * and xmlDoValidityCheckingDefaultValue for VMS diff --git a/parserInternals.c b/parserInternals.c index 90b48122..cf7a96b8 100644 --- a/parserInternals.c +++ b/parserInternals.c @@ -4,7 +4,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #include "libxml.h" @@ -3321,7 +3321,7 @@ xmlParserHandleReference(xmlParserCtxtPtr ctxt ATTRIBUTE_UNUSED) { xmlGenericError(xmlGenericErrorContext, "Reached deprecated section in xmlParserHandleReference()\n"); xmlGenericError(xmlGenericErrorContext, - "Please forward the document to Daniel.Veillard@w3.org\n"); + "Please forward the document to daniel@veillard.com\n"); xmlGenericError(xmlGenericErrorContext, "indicating the version: %s, thanks !\n", xmlParserVersion); NEXT; diff --git a/testCatalog.c b/testCatalog.c index fa4c646d..0bc3ccfb 100644 --- a/testCatalog.c +++ b/testCatalog.c @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #include "libxml.h" @@ -12,7 +12,6 @@ #include #include -#include #include #include #include diff --git a/testDocbook.c b/testDocbook.c index dfe53bd9..cea9f939 100644 --- a/testDocbook.c +++ b/testDocbook.c @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #include "libxml.h" diff --git a/testHTML.c b/testHTML.c index 47bf2803..12fe0489 100644 --- a/testHTML.c +++ b/testHTML.c @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #include "libxml.h" diff --git a/testSAX.c b/testSAX.c index f51a3eb1..b22a360e 100644 --- a/testSAX.c +++ b/testSAX.c @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #include "libxml.h" diff --git a/testURI.c b/testURI.c index ccd0a67f..dcbda1f5 100644 --- a/testURI.c +++ b/testURI.c @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #include "libxml.h" diff --git a/testXPath.c b/testXPath.c index b3a63246..f91a2e65 100644 --- a/testXPath.c +++ b/testXPath.c @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #include "libxml.h" diff --git a/tree.c b/tree.c index 3316d25a..6accfbc7 100644 --- a/tree.c +++ b/tree.c @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com * * 14 Nov 2000 ht - Changed the name of function xmlBufferWriteChar under VMS * as it was similar to xmlBufferWriteCHAR when compiling without case diff --git a/uri.c b/uri.c index 09344794..61d93636 100644 --- a/uri.c +++ b/uri.c @@ -5,7 +5,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #include "libxml.h" diff --git a/valid.c b/valid.c index 217fd450..9a46d039 100644 --- a/valid.c +++ b/valid.c @@ -4,7 +4,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #include "libxml.h" diff --git a/xinclude.c b/xinclude.c index 89d74a30..813e3e66 100644 --- a/xinclude.c +++ b/xinclude.c @@ -6,7 +6,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ /* diff --git a/xlink.c b/xlink.c index 28e5dfa3..cb373024 100644 --- a/xlink.c +++ b/xlink.c @@ -4,7 +4,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ diff --git a/xmlIO.c b/xmlIO.c index fba4b545..84e0a46a 100644 --- a/xmlIO.c +++ b/xmlIO.c @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com * * 14 Nov 2000 ht - for VMS, truncated name of long functions to under 32 char */ diff --git a/xmllint.1 b/xmllint.1 index 62a85bf6..2e9b8148 100644 --- a/xmllint.1 +++ b/xmllint.1 @@ -106,7 +106,7 @@ executable .SH "SEE ALSO" .BR libxml (4) .SH AUTHOR -Daniel Veillard (Daniel.Veillard@w3.org) +Daniel Veillard (daniel@veillard.com) Manual page by Ziying Sherwin, Lister Hill National Center for Biomedical Communication, U.S. National Library of Medicine (sherwin@nlm.nih.gov). diff --git a/xmllint.c b/xmllint.c index aff1a04a..8cb17b4f 100644 --- a/xmllint.c +++ b/xmllint.c @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #include "libxml.h" diff --git a/xmlmemory.c b/xmlmemory.c index e6c51b5c..4a9350e6 100644 --- a/xmlmemory.c +++ b/xmlmemory.c @@ -1,7 +1,7 @@ /* * memory.c: libxml memory allocator wrapper. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #include "libxml.h" diff --git a/xpath.c b/xpath.c index c22a8385..57311cd3 100644 --- a/xpath.c +++ b/xpath.c @@ -10,7 +10,7 @@ * * See COPYRIGHT for the status of this software * - * Author: Daniel.Veillard@w3.org + * Author: daniel@veillard.com * * 14 Nov 2000 ht - truncated declaration of xmlXPathEvalRelativeLocationPath * for VMS diff --git a/xpointer.c b/xpointer.c index 2a61003b..caf39bbe 100644 --- a/xpointer.c +++ b/xpointer.c @@ -6,7 +6,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #include "libxml.h"