diff --git a/ChangeLog b/ChangeLog index c84fd18a..a3bc6c04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Oct 30 13:33:13 CET 2001 Daniel Veillard + + * configure.in: preparing 2.4.7 + * Makefile.am doc/Makefile.am: switched to the latest xmllint + manual page from John + * doc/*: updated the doc and rebuilt the generated pages + Tue Oct 30 11:31:19 CET 2001 Daniel Veillard * xmlIO.c: closing bug #62711, the library should never diff --git a/Makefile.am b/Makefile.am index 36dcce5d..98aea6e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ endif DEPS = $(top_builddir)/libxml2.la LDADDS = $(top_builddir)/libxml2.la @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) -lm -man_MANS = xmllint.1 xml2-config.1 libxml.4 +man_MANS = xml2-config.1 libxml.4 m4datadir = $(datadir)/aclocal m4data_DATA = libxml.m4 diff --git a/configure.in b/configure.in index 39d36ce5..34b80144 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ AC_CANONICAL_HOST LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=4 -LIBXML_MICRO_VERSION=6 +LIBXML_MICRO_VERSION=7 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION diff --git a/doc/DOM.html b/doc/DOM.html index 2189d07d..46e4b6d2 100644 --- a/doc/DOM.html +++ b/doc/DOM.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/FAQ.html b/doc/FAQ.html index c14c3d7c..b3022bfa 100644 --- a/doc/FAQ.html +++ b/doc/FAQ.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/Makefile.am b/doc/Makefile.am index 650d0e0e..fb3809eb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -17,7 +17,7 @@ PAGES= architecture.html bugs.html contribs.html docs.html DOM.html \ interface.html intro.html library.html namespaces.html news.html \ tree.html xmldtd.html XML.html XSLT.html -man_MANS = xmlcatalog.1 +man_MANS = xmllint.1 xmlcatalog.1 all: $(PAGES) diff --git a/doc/XML.html b/doc/XML.html index 5079d978..e2a7d3a4 100644 --- a/doc/XML.html +++ b/doc/XML.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/XSLT.html b/doc/XSLT.html index ecbb0237..41902808 100644 --- a/doc/XSLT.html +++ b/doc/XSLT.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/architecture.html b/doc/architecture.html index 2ebb0330..ed9315aa 100644 --- a/doc/architecture.html +++ b/doc/architecture.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/bugs.html b/doc/bugs.html index 447e318d..f4c92689 100644 --- a/doc/bugs.html +++ b/doc/bugs.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/catalog.html b/doc/catalog.html index 6e98be13..e539bb1f 100644 --- a/doc/catalog.html +++ b/doc/catalog.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/contribs.html b/doc/contribs.html index 174d8366..20d17076 100644 --- a/doc/contribs.html +++ b/doc/contribs.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/docs.html b/doc/docs.html index a736ab6b..998b6f4e 100644 --- a/doc/docs.html +++ b/doc/docs.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/downloads.html b/doc/downloads.html index b5bf2856..d1e5eebd 100644 --- a/doc/downloads.html +++ b/doc/downloads.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/encoding.html b/doc/encoding.html index fcc05a2f..b51261f8 100644 --- a/doc/encoding.html +++ b/doc/encoding.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/entities.html b/doc/entities.html index 7bc72ee5..986857f1 100644 --- a/doc/entities.html +++ b/doc/entities.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/example.html b/doc/example.html index ff49607a..59e6f706 100644 --- a/doc/example.html +++ b/doc/example.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/gnome-xml.sgml b/doc/gnome-xml.sgml index a89de42a..4eb04640 100644 --- a/doc/gnome-xml.sgml +++ b/doc/gnome-xml.sgml @@ -21,6 +21,10 @@ + + + + ]> @@ -96,9 +100,13 @@ &nanoftp; &xmlIO; &catalog; + &threads; + &globals; + &global_functions; &DOCBparser; &parserInternals; &encoding; + &hash; &debugXML; &xmlmemory; diff --git a/doc/help.html b/doc/help.html index 191b2c18..45375025 100644 --- a/doc/help.html +++ b/doc/help.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/html/book1.html b/doc/html/book1.html index f0f78efc..7fbbcbcb 100644 --- a/doc/html/book1.html +++ b/doc/html/book1.html @@ -209,6 +209,16 @@ HREF="libxml-catalog.html" > —
    threads —
    globals —
    DOCBparser —
    —
    hash —
    debugXML —
    + + + + @@ -427,6 +431,7 @@ + @@ -775,6 +780,8 @@ + + @@ -811,9 +818,21 @@ + + + + + + + + + + + + + - @@ -835,6 +854,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1002,6 +1069,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1013,10 +1107,27 @@ + + + + + + + + + + + + + + + + + diff --git a/doc/html/libxml-catalog.html b/doc/html/libxml-catalog.html index 787702b1..3c141428 100644 --- a/doc/html/libxml-catalog.html +++ b/doc/html/libxml-catalog.html @@ -16,8 +16,8 @@ REL="PREVIOUS" TITLE="xmlIO" HREF="libxml-xmlio.html">

    Name

    Synopsis

    xmlCatalogAllow; +struct xmlCatalog; +typedef xmlCatalogPtr; +xmlCatalogPtr xmlLoadACatalog (const char *filename); +xmlCatalogPtr xmlLoadSGMLSuperCatalog (const char *filename); +int xmlConvertSGMLCatalog (xmlCatalogPtr catal); +int xmlACatalogAdd (xmlCatalogPtr catal, + const xmlChar *type, + const xmlChar *orig, + const xmlChar *replace); +int xmlACatalogRemove (xmlCatalogPtr catal, + const xmlChar *value); +xmlChar* xmlACatalogResolve (xmlCatalogPtr catal, + const xmlChar *pubID, + const xmlChar *sysID); +xmlChar* xmlACatalogResolveSystem (xmlCatalogPtr catal, + const xmlChar *sysID); +xmlChar* xmlACatalogResolvePublic (xmlCatalogPtr catal, + const xmlChar *pubID); +xmlChar* xmlACatalogResolveURI (xmlCatalogPtr catal, + const xmlChar *URI); +void xmlACatalogDump (xmlCatalogPtr catal, + FILE *out); +void xmlFreeCatalog (xmlCatalogPtr catal); void xmlInitializeCatalogxmlLoadCatalog (const char *filename); -int xmlLoadSGMLSuperCatalog (const char *filename); void xmlLoadCatalogs

    Description

    Details

    struct xmlCatalog

    struct xmlCatalog;

    xmlCatalogPtr

    typedef xmlCatalog *xmlCatalogPtr;

    xmlLoadACatalog ()

    xmlCatalogPtr xmlLoadACatalog               (const char *filename);

    Load the catalog and build the associated data structures. +This can be either an XML Catalog or an SGML Catalog +It will recurse in SGML CATALOG entries. On the other hand XML +Catalogs are not handled recursively.

    filename : a file path
    Returns :the catalog parsed or NULL in case of error

    xmlLoadSGMLSuperCatalog ()

    xmlCatalogPtr xmlLoadSGMLSuperCatalog       (const char *filename);

    Load an SGML super catalog. It won't expand CATALOG or DELEGATE +references. This is only needed for manipulating SGML Super Catalogs +like adding and removing CATALOG or DELEGATE entries.

    filename : a file path
    Returns :the catalog parsed or NULL in case of error

    xmlConvertSGMLCatalog ()

    int         xmlConvertSGMLCatalog           (xmlCatalogPtr catal);

    Convert all the SGML catalog entries as XML ones

    catal : the catalog
    Returns :the number of entries converted if successful, -1 otherwise

    xmlACatalogAdd ()

    int         xmlACatalogAdd                  (xmlCatalogPtr catal,
+                                             const xmlChar *type,
+                                             const xmlChar *orig,
+                                             const xmlChar *replace);

    Add an entry in the catalog, it may overwrite existing but +different entries.

    catal : a Catalog
    type : the type of record to add to the catalog
    orig : the system, public or prefix to match
    replace : the replacement value for the match
    Returns :0 if successful, -1 otherwise

    xmlACatalogRemove ()

    int         xmlACatalogRemove               (xmlCatalogPtr catal,
+                                             const xmlChar *value);

    Remove an entry from the catalog

    catal : a Catalog
    value : the value to remove
    Returns :the number of entries removed if successful, -1 otherwise

    xmlACatalogResolve ()

    xmlChar*    xmlACatalogResolve              (xmlCatalogPtr catal,
+                                             const xmlChar *pubID,
+                                             const xmlChar *sysID);

    Do a complete resolution lookup of an External Identifier

    catal : a Catalog
    pubID : the public ID string
    sysID : the system ID string
    Returns :the URI of the resource or NULL if not found, it must be freed +by the caller.

    xmlACatalogResolveSystem ()

    xmlChar*    xmlACatalogResolveSystem        (xmlCatalogPtr catal,
+                                             const xmlChar *sysID);

    Try to lookup the catalog resource for a system ID

    catal : a Catalog
    sysID : the public ID string
    Returns :the system ID if found or NULL otherwise, the value returned +must be freed by the caller.

    xmlACatalogResolvePublic ()

    xmlChar*    xmlACatalogResolvePublic        (xmlCatalogPtr catal,
+                                             const xmlChar *pubID);

    Try to lookup the system ID associated to a public ID in that catalog

    catal : a Catalog
    pubID : the public ID string
    Returns :the system ID if found or NULL otherwise, the value returned +must be freed by the caller.

    xmlACatalogResolveURI ()

    xmlChar*    xmlACatalogResolveURI           (xmlCatalogPtr catal,
+                                             const xmlChar *URI);

    Do a complete resolution lookup of an URI

    catal : a Catalog
    URI : 
    Returns :the URI of the resource or NULL if not found, it must be freed +by the caller.

    xmlACatalogDump ()

    void        xmlACatalogDump                 (xmlCatalogPtr catal,
+                                             FILE *out);

    Free up all the memory associated with catalogs

    catal : a Catalog
    out : the file.

    xmlFreeCatalog ()

    void        xmlFreeCatalog                  (xmlCatalogPtr catal);

    Free the memory allocated to a Catalog

    catal : a Catalog entry

    Do the catalog initialization. -TODO: this function is not thread safe, catalog initialization should +this function is not thread safe, catalog initialization should preferably be done once at startup

    Load the catalog and makes its definitions effective for the default external entity loader. It will recurse in SGML CATALOG entries. -TODO: this function is not thread safe, catalog initialization should +this function is not thread safe, catalog initialization should preferably be done once at startup

    xmlLoadSGMLSuperCatalog ()

    int         xmlLoadSGMLSuperCatalog         (const char *filename);

    Load an SGML super catalog. It won't expand CATALOG or DELEGATE -references. This is only needed for manipulating SGML Super Catalogs -like adding and removing CATALOG or DELEGATE entries.

    filename : a file path
    Returns :0 in case of success -1 in case of error

    Load the catalogs and makes their definitions effective for the default external entity loader. -TODO: this function is not thread safe, catalog initialization should +this function is not thread safe, catalog initialization should preferably be done once at startup

    Add an entry in the catalog, it may overwrite existing but -different entries.

    xmlInitializeCatalog    ();

    DOCBparserthreads

    Name

    Synopsis

    xmlDocPtr doc); +void xmlLsOneNode (FILE *output, + xmlNodePtr node); +int xmlLsCountNode (xmlNodePtr node); +const char* xmlBoolToText (int bool); +long xmlGetLineNo (xmlNodePtr node); char* (*xmlShellReadlineFuncxmlNodePtr node2); void xmlShellPrintXPathError (int errorType, + const char *arg); +void xmlShellPrintNode (xmlNodePtr node); +void xmlShellPrintXPathResult (xmlXPathObjectPtr list); +int xmlShellList (xmlShellCtxtPtr ctxt, + char *arg, + xmlNodePtr node, + xmlNodePtr node2); +int xmlShellBase (xmlShellCtxtPtr ctxt, + char *arg, + xmlNodePtr node, + xmlNodePtr node2); +int xmlShellDir (xmlShellCtxtPtr ctxt, + char *arg, + xmlNodePtr node, + xmlNodePtr node2); +int xmlShellCat (xmlShellCtxtPtr ctxt, + char *arg, + xmlNodePtr node, + xmlNodePtr node2); +int xmlShellLoad (xmlShellCtxtPtr ctxt, + char *filename, + xmlNodePtr node, + xmlNodePtr node2); +int xmlShellWrite (xmlShellCtxtPtr ctxt, + char *filename, + xmlNodePtr node, + xmlNodePtr node2); +int xmlShellSave (xmlShellCtxtPtr ctxt, + char *filename, + xmlNodePtr node, + xmlNodePtr node2); +int xmlShellValidate (xmlShellCtxtPtr ctxt, + char *dtd, + xmlNodePtr node, + xmlNodePtr node2); +int xmlShellDu (xmlShellCtxtPtr ctxt, + char *arg, + xmlNodePtr tree, + xmlNodePtr node2); +int xmlShellPwd (xmlShellCtxtPtr ctxt, + char *buffer, + xmlNodePtr node, + xmlNodePtr node2); +void xmlShell (

    Description

    Details

    xmlLsOneNode ()

    void        xmlLsOneNode                    (FILE *output,
+                                             xmlNodePtr node);

    output : 
    node : 

    xmlLsCountNode ()

    int         xmlLsCountNode                  (xmlNodePtr node);

    node : 
    Returns : 

    xmlBoolToText ()

    const char* xmlBoolToText                   (int bool);

    Convenient way to turn bool into text

    bool : a bool to turn into text
    Returns : 

    xmlGetLineNo ()

    long        xmlGetLineNo                    (xmlNodePtr node);

    Get line number of node

    node : valid node
    Returns :the line number if sucessfull, -1 otherwise

    xmlShellPrintXPathError ()

    void        xmlShellPrintXPathError         (int errorType,
+                                             const char *arg);

    errorType : 
    arg : 

    xmlShellPrintNode ()

    void        xmlShellPrintNode               (xmlNodePtr node);

    Print node to stdout

    node : a non-null node to print to stdout

    xmlShellPrintXPathResult ()

    void        xmlShellPrintXPathResult        (xmlXPathObjectPtr list);

    Prints result to stdout

    list : 

    xmlShellList ()

    int         xmlShellList                    (xmlShellCtxtPtr ctxt,
+                                             char *arg,
+                                             xmlNodePtr node,
+                                             xmlNodePtr node2);

    Implements the XML shell function "ls" +Does an Unix like listing of the given node (like a directory)

    ctxt : the shell context
    arg : unused
    node : a node
    node2 : unused
    Returns :0

    xmlShellBase ()

    int         xmlShellBase                    (xmlShellCtxtPtr ctxt,
+                                             char *arg,
+                                             xmlNodePtr node,
+                                             xmlNodePtr node2);

    Implements the XML shell function "base" +dumps the current XML base of the node

    ctxt : the shell context
    arg : unused
    node : a node
    node2 : unused
    Returns :0

    xmlShellDir ()

    int         xmlShellDir                     (xmlShellCtxtPtr ctxt,
+                                             char *arg,
+                                             xmlNodePtr node,
+                                             xmlNodePtr node2);

    Implements the XML shell function "dir" +dumps informations about the node (namespace, attributes, content).

    ctxt : the shell context
    arg : unused
    node : a node
    node2 : unused
    Returns :0

    xmlShellCat ()

    int         xmlShellCat                     (xmlShellCtxtPtr ctxt,
+                                             char *arg,
+                                             xmlNodePtr node,
+                                             xmlNodePtr node2);

    Implements the XML shell function "cat" +dumps the serialization node content (XML or HTML).

    ctxt : the shell context
    arg : unused
    node : a node
    node2 : unused
    Returns :0

    xmlShellLoad ()

    int         xmlShellLoad                    (xmlShellCtxtPtr ctxt,
+                                             char *filename,
+                                             xmlNodePtr node,
+                                             xmlNodePtr node2);

    Implements the XML shell function "load" +loads a new document specified by the filename

    ctxt : the shell context
    filename : the file name
    node : unused
    node2 : unused
    Returns :0 or -1 if loading failed

    xmlShellWrite ()

    int         xmlShellWrite                   (xmlShellCtxtPtr ctxt,
+                                             char *filename,
+                                             xmlNodePtr node,
+                                             xmlNodePtr node2);

    Implements the XML shell function "write" +Write the current node to the filename, it saves the serailization +of the subtree under the node specified

    ctxt : the shell context
    filename : the file name
    node : a node in the tree
    node2 : unused
    Returns :0 or -1 in case of error

    xmlShellSave ()

    int         xmlShellSave                    (xmlShellCtxtPtr ctxt,
+                                             char *filename,
+                                             xmlNodePtr node,
+                                             xmlNodePtr node2);

    Implements the XML shell function "save" +Write the current document to the filename, or it's original name

    ctxt : the shell context
    filename : the file name (optionnal)
    node : unused
    node2 : unused
    Returns :0 or -1 in case of error

    xmlShellValidate ()

    int         xmlShellValidate                (xmlShellCtxtPtr ctxt,
+                                             char *dtd,
+                                             xmlNodePtr node,
+                                             xmlNodePtr node2);

    Implements the XML shell function "validate" +Validate the document, if a DTD path is provided, then the validation +is done against the given DTD.

    ctxt : the shell context
    dtd : the DTD URI (optionnal)
    node : unused
    node2 : unused
    Returns :0 or -1 in case of error

    xmlShellDu ()

    int         xmlShellDu                      (xmlShellCtxtPtr ctxt,
+                                             char *arg,
+                                             xmlNodePtr tree,
+                                             xmlNodePtr node2);

    Implements the XML shell function "du" +show the structure of the subtree under node tree +If tree is null, the command works on the current node.

    ctxt : the shell context
    arg : unused
    tree : a node defining a subtree
    node2 : unused
    Returns :0 or -1 in case of error

    xmlShellPwd ()

    int         xmlShellPwd                     (xmlShellCtxtPtr ctxt,
+                                             char *buffer,
+                                             xmlNodePtr node,
+                                             xmlNodePtr node2);

    Implements the XML shell function "pwd" +Show the full path from the root to the node, if needed building +thumblers when similar elements exists at a given ancestor level. +The output is compatible with XPath commands.

    ctxt : the shell context
    buffer : the output buffer
    node : 
    node2 : unused
    Returns :0 or -1 in case of error

    encodinghash

    Name

    Synopsis

    Description

    Details

    catalogglobals

    Name

    Synopsis

    Description

    Details

    debugXMLhash

    Name

    Synopsis

    Description

    Details

    Name

    Synopsis

    Description

    Details

    Name

    Synopsis

    Description

    Details

    —
    threads —
    globals —
    DOCBparser —
    —
    hash —
    debugXML —
    This section contains the API reference for libxml. All the public interfaces are documented here. This reference guide is build by extracting comments from the code sources.

    _functions; +


    Name

    Synopsis

    Description

    Details

    Name

    Synopsis

    Description

    Details

    #define xmlSubstituteEntitiesDefaultValue xmlSubstituteEntitiesDefaultVal
    #define xmlSubstituteEntitiesDefaultValue

    Name

    Synopsis

    Description

    Details

    *value, int len); void initxmlDefaultSAXHandler (xmlSAXHandler *hdlr, + int warning); +void inithtmlDefaultSAXHandler (xmlSAXHandler *hdlr); +void initdocbDefaultSAXHandler (xmlSAXHandler *hdlr); +void xmlDefaultSAXHandlerInit (void); @@ -510,7 +532,7 @@ HREF="libxml-sax.html#DOCBDEFAULTSAXHANDLERINIT" >

    Description

    Details

    initxmlDefaultSAXHandler ()

    void        initxmlDefaultSAXHandler        (xmlSAXHandler *hdlr,
+                                             int warning);

    hdlr : 
    warning : 

    inithtmlDefaultSAXHandler ()

    void        inithtmlDefaultSAXHandler       (xmlSAXHandler *hdlr);

    hdlr : 

    initdocbDefaultSAXHandler ()

    void        initdocbDefaultSAXHandler       (xmlSAXHandler *hdlr);

    hdlr : 

    Name

    Synopsis

    +#define BASE_BUFFER_SIZE #define XML_XML_NAMESPACE

    Description

    Details

    BASE_BUFFER_SIZE

    #define BASE_BUFFER_SIZE 4000

    Name

    Synopsis

    Description

    Details

    Name

    Synopsis

    Description

    Details

    Name

    Synopsis

    Description

    Details

    Name

    Synopsis

    xmlGenericErrorFunc handler); void initGenericErrorDefaultFunc (xmlGenericErrorFunc *handler); +void xmlParserError (void *ctx, @@ -209,7 +216,7 @@ HREF="libxml-parser.html#XMLPARSERINPUTPTR" >

    Description

    Details

    initGenericErrorDefaultFunc ()

    void        initGenericErrorDefaultFunc     (xmlGenericErrorFunc *handler);

    handler : 

    Name

    Synopsis

    xmlOutputBufferPtr; void xmlCleanupInputCallbacks (void); +void xmlCleanupOutputCallbacks (void); +void xmlRegisterDefaultInputCallbacks @@ -547,7 +555,7 @@ HREF="libxml-tree.html#XMLDOCPTR" >

    Description

    Details

    xmlCleanupInputCallbacks ()

    void        xmlCleanupInputCallbacks        (void);

    clears the entire input callback table. this includes the +compiled-in I/O.

    xmlCleanupOutputCallbacks ()

    void        xmlCleanupOutputCallbacks       (void);

    clears the entire output callback table. this includes the +compiled-in I/O callbacks.

    Name

    Synopsis

    xmlMemoryDump (void); #define xmlMalloc (size) #define xmlRealloc (ptr, size) #define xmlMemStrdup (str) void*

    Description

    Details

    #define xmlMalloc(size) xmlMallocLoc((size), __FILE__, __LINE__)
    #define xmlMalloc(size)

    #define xmlRealloc(ptr, size) xmlReallocLoc((ptr), (size), __FILE__, __LINE__)
    #define xmlRealloc(ptr, size)

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

    Name

    Synopsis

    Description

    Details

    Name

    Synopsis

    Description

    Details

    ctxt : the XPath Parser context
    cur : the current node in the traversal
    Returns :the next element following that axis

    xmlXPathNextChild ()

    xmlNodePtr  xmlXPathNextChild               (xmlXPathParserContextPtr ctxt,
-                                             xmlNodePtr cur);

    Traversal function for the "child" direction -The child axis contains the children of the context node in document order.

    ctxt : the XPath Parser context
    cur : the current node in the traversal
    Returns :the next element following that axis

    xmlXPathNextDescendant ()

    xmlNodePtr  xmlXPathNextDescendant          (xmlXPathParserContextPtr ctxt,
-                                             xmlNodePtr cur);

    Traversal function for the "descendant" direction -the descendant axis contains the descendants of the context node in document -order; a descendant is a child or a child of a child and so on.

    ctxt : the XPath Parser context
    cur : the current node in the traversal
    Returns :the next element following that axis

    xmlXPathNextDescendantOrSelf ()

    xmlNodePtr  xmlXPathNextDescendantOrSelf    (xmlXPathParserContextPtr ctxt,
-                                             xmlNodePtr cur);

    Traversal function for the "descendant-or-self" direction -the descendant-or-self axis contains the context node and the descendants -of the context node in document order; thus the context node is the first -node on the axis, and the first child of the context node is the second node -on the axis

    xmlXPathNextParent ()

    xmlXPathNextChild ()

    xmlNodePtr xmlXPathNextParent ( xmlXPathNextChild (xmlXPathParserContextPtr ctxt, @@ -12376,8 +12048,8 @@ HREF="libxml-tree.html#XMLNODEPTR" >

    Traversal function for the "parent" direction -The parent axis contains the parent of the context node, if there is one.

    Traversal function for the "child" direction +The child axis contains the children of the context node in document order.

    xmlXPathNextAncestorOrSelf ()

    xmlXPathNextDescendant ()

    xmlNodePtr xmlXPathNextAncestorOrSelf ( xmlXPathNextDescendant (xmlXPathParserContextPtr ctxt, @@ -12484,11 +12156,9 @@ HREF="libxml-tree.html#XMLNODEPTR" >

    Traversal function for the "ancestor-or-self" direction -he ancestor-or-self axis contains the context node and ancestors of -the context node in reverse document order; thus the context node is -the first node on the axis, and the context node's parent the second; -parent here is defined the same as with the parent axis.

    Traversal function for the "descendant" direction +the descendant axis contains the descendants of the context node in document +order; a descendant is a child or a child of a child and so on.

    xmlXPathNextFollowingSibling ()

    xmlXPathNextDescendantOrSelf ()

    xmlNodePtr xmlXPathNextFollowingSibling ( xmlXPathNextDescendantOrSelf (xmlXPathParserContextPtr ctxt, @@ -12595,9 +12265,11 @@ HREF="libxml-tree.html#XMLNODEPTR" >

    Traversal function for the "following-sibling" direction -The following-sibling axis contains the following siblings of the context -node in document order.

    Traversal function for the "descendant-or-self" direction +the descendant-or-self axis contains the context node and the descendants +of the context node in document order; thus the context node is the first +node on the axis, and the first child of the context node is the second node +on the axis

    xmlXPathNextFollowing ()

    xmlXPathNextParent ()

    xmlNodePtr xmlXPathNextFollowing ( xmlXPathNextParent (xmlXPathParserContextPtr ctxt, @@ -12704,11 +12376,8 @@ HREF="libxml-tree.html#XMLNODEPTR" >

    Traversal function for the "following" direction -The following axis contains all nodes in the same document as the context -node that are after the context node in document order, excluding any -descendants and excluding attribute nodes and namespace nodes; the nodes -are ordered in document order

    Traversal function for the "parent" direction +The parent axis contains the parent of the context node, if there is one.

    xmlXPathNextNamespace ()

    xmlXPathNextAncestorOrSelf ()

    xmlNodePtr xmlXPathNextNamespace ( xmlXPathNextAncestorOrSelf (xmlXPathParserContextPtr ctxt, @@ -12815,237 +12484,17 @@ HREF="libxml-tree.html#XMLNODEPTR" >

    Traversal function for the "namespace" direction -the namespace axis contains the namespace nodes of the context node; -the order of nodes on this axis is implementation-defined; the axis will -be empty unless the context node is an element

    We keep the XML namespace node at the end of the list.

    Traversal function for the "ancestor-or-self" direction +he ancestor-or-self axis contains the context node and ancestors of +the context node in reverse document order; thus the context node is +the first node on the axis, and the context node's parent the second; +parent here is defined the same as with the parent axis.

    ctxt : the XPath Parser context
    cur : the current attribute in the traversal
    Returns :the next element following that axis

    xmlXPathNextAttribute ()

    xmlNodePtr  xmlXPathNextAttribute           (xmlXPathParserContextPtr ctxt,
-                                             xmlNodePtr cur);

    Traversal function for the "attribute" direction -TODO: support DTD inherited default attributes

    ctxt : the XPath Parser context
    cur : the current attribute in the traversal
    Returns :the next element following that axis

    xmlXPathNextPreceding ()

    xmlNodePtr  xmlXPathNextPreceding           (xmlXPathParserContextPtr ctxt,
-                                             xmlNodePtr cur);

    Traversal function for the "preceding" direction -the preceding axis contains all nodes in the same document as the context -node that are before the context node in document order, excluding any -ancestors and excluding attribute nodes and namespace nodes; the nodes are -ordered in reverse document order

    xmlXPathNextAncestor ()

    xmlXPathNextFollowingSibling ()

    xmlNodePtr xmlXPathNextAncestor ( xmlXPathNextFollowingSibling (xmlXPathParserContextPtr ctxt, @@ -13146,12 +12595,232 @@ HREF="libxml-tree.html#XMLNODEPTR" >

    Traversal function for the "ancestor" direction -the ancestor axis contains the ancestors of the context node; the ancestors -of the context node consist of the parent of context node and the parent's -parent and so on; the nodes are ordered in reverse document order; thus the -parent is the first node on the axis, and the parent's parent is the second -node on the axis

    Traversal function for the "following-sibling" direction +The following-sibling axis contains the following siblings of the context +node in document order.

    ctxt : the XPath Parser context
    cur : the current node in the traversal
    Returns :the next element following that axis

    xmlXPathNextFollowing ()

    xmlNodePtr  xmlXPathNextFollowing           (xmlXPathParserContextPtr ctxt,
+                                             xmlNodePtr cur);

    Traversal function for the "following" direction +The following axis contains all nodes in the same document as the context +node that are after the context node in document order, excluding any +descendants and excluding attribute nodes and namespace nodes; the nodes +are ordered in document order

    ctxt : the XPath Parser context
    cur : the current node in the traversal
    Returns :the next element following that axis

    xmlXPathNextNamespace ()

    xmlNodePtr  xmlXPathNextNamespace           (xmlXPathParserContextPtr ctxt,
+                                             xmlNodePtr cur);

    Traversal function for the "namespace" direction +the namespace axis contains the namespace nodes of the context node; +the order of nodes on this axis is implementation-defined; the axis will +be empty unless the context node is an element

    We keep the XML namespace node at the end of the list.

    the current node in the traversal the current attribute in the traversal

    xmlXPathNextPrecedingSibling ()

    xmlXPathNextAttribute ()

    xmlNodePtr xmlXPathNextPrecedingSibling ( xmlXPathNextAttribute (xmlXPathParserContextPtr ctxt, @@ -13258,10 +12927,8 @@ HREF="libxml-tree.html#XMLNODEPTR" >

    Traversal function for the "preceding-sibling" direction -The preceding-sibling axis contains the preceding siblings of the context -node in reverse document order; the first preceding sibling is first on the -axis; the sibling preceding that node is the second on the axis and so on.

    Traversal function for the "attribute" direction +TODO: support DTD inherited default attributes

    the current attribute in the traversalReturns :the next element following that axis

    xmlXPathNextPreceding ()

    xmlNodePtr  xmlXPathNextPreceding           (xmlXPathParserContextPtr ctxt,
+                                             xmlNodePtr cur);

    Traversal function for the "preceding" direction +the preceding axis contains all nodes in the same document as the context +node that are before the context node in document order, excluding any +ancestors and excluding attribute nodes and namespace nodes; the nodes are +ordered in reverse document order

    xmlXPathNextAncestor ()

    ctxt : the XPath Parser context
    cur : the current node in the traversal
    xmlNodePtr  xmlXPathNextAncestor            (xmlXPathParserContextPtr ctxt,
+                                             xmlNodePtr cur);

    Traversal function for the "ancestor" direction +the ancestor axis contains the ancestors of the context node; the ancestors +of the context node consist of the parent of context node and the parent's +parent and so on; the nodes are ordered in reverse document order; thus the +parent is the first node on the axis, and the parent's parent is the second +node on the axis

    ctxt : the XPath Parser context
    cur : the current node in the traversal
    Returns :the next element following that axis

    xmlXPathNextPrecedingSibling ()

    xmlNodePtr  xmlXPathNextPrecedingSibling    (xmlXPathParserContextPtr ctxt,
+                                             xmlNodePtr cur);

    Traversal function for the "preceding-sibling" direction +The preceding-sibling axis contains the preceding siblings of the context +node in reverse document order; the first preceding sibling is first on the +axis; the sibling preceding that node is the second on the axis and so on.

    ctxt : the XPath Parser context
    cur : the current node in the traversal
    Returns :the next element following that axis

    Name

    Synopsis

    Description

    Details

    Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/interface.html b/doc/interface.html index 17a2a8bc..6adc52ba 100644 --- a/doc/interface.html +++ b/doc/interface.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/intro.html b/doc/intro.html index ff9e9297..f253a8c7 100644 --- a/doc/intro.html +++ b/doc/intro.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/library.html b/doc/library.html index 99a0a9d8..4bda13bb 100644 --- a/doc/library.html +++ b/doc/library.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/namespaces.html b/doc/namespaces.html index 74fd164c..ae293f92 100644 --- a/doc/namespaces.html +++ b/doc/namespaces.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/news.html b/doc/news.html index 31b6d6a6..a13b642a 100644 --- a/doc/news.html +++ b/doc/news.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/site.xsl b/doc/site.xsl index aa589347..b1264722 100644 --- a/doc/site.xsl +++ b/doc/site.xsl @@ -85,6 +85,9 @@ xmlmem.html + + threads.html + FAQ.html diff --git a/doc/threads.html b/doc/threads.html new file mode 100644 index 00000000..048235b2 --- /dev/null +++ b/doc/threads.html @@ -0,0 +1,103 @@ + + + + + +Thread safety + + + + + +
    +Gnome LogoW3C LogoRed Hat Logo +
    +

    The XML C library for Gnome

    +

    Thread safety

    +
    +
    + + +
    + + + +
    Main Menu
    + + + +
    Related links
    +
    +

    Starting with 2.4.7, libxml makes provisions to ensure that concurent +threads can safely work in parallel parsing different documents. There is +however a couple of things to do to ensure it:

    +
      +
    • configure the library accordingly using the --with-threads options
      • +
    • call xmlInitParser() in the "main" thread before using any of the + libxml API (except possibly selecting a different memory allocator)
      • +
    +

    Note that the thread safety cannot be ensured for multiple threads sharing +the same document, the locking must be done at the application level, libxml +exports a basic mutex and reentrant mutexes API in <libxml/threads.h>. +The parts of the library checked for thread safety are:

    +
      +
    • concurrent loading
      • +
    • file access resolution
      • +
    • catalog access
      • +
    • catalog building
      • +
    • entities lookup/accesses
      • +
    • validation
      • +
    • global variables per-thread override
      • +
    • memory handling
      • +
    +

    XPath is supposed to be thread safe now, but this wasn't tested +seriously.

    +

    Daniel Veillard

    +
    + + diff --git a/doc/tree.html b/doc/tree.html index f84e328f..7fd0d772 100644 --- a/doc/tree.html +++ b/doc/tree.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/upgrade.html b/doc/upgrade.html index efb8aefb..47212d2e 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
  • Entities or no entities
  • Namespaces
  • Upgrading 1.x code
    • +
  • Thread safety
  • DOM Principles
  • A real example
  • Contributions
    • diff --git a/doc/xml.html b/doc/xml.html index d4befa98..a8c0d100 100644 --- a/doc/xml.html +++ b/doc/xml.html @@ -559,9 +559,25 @@ you want to test those

    SGML docs +

    2.4.7: Oct 30 2001

    +
      +
    • exported some debugging interfaces
      • +
    • serious rewrite of the catalog code
      • +
    • integrated Gary Pennington thread safety patch, added configure option + and regression tests
      • +
    • removed an HTML parser bug
      • +
    • fixed a couple of potentially serious validation bugs
      • +
    • integrated the SGML DocBook support in xmllint
      • +
    • changed the nanoftp anonymous login passwd
      • +
    • some I/O cleanup and a couple of interfaces for Perl wrapper
      • +
    • general bug fixes
      • +
    • updated xmllint man page by John Fleck
      • +
    • some VMS and Windows updates
      • +
    +

    2.4.6: Oct 10 2001

      -
    • added and updated man pages by John Fleck
      • +
    • added an updated man pages by John Fleck
    • portability and configure fixes
    • an infinite loop on the HTML parser was removed (William)
    • Windows makefile patches from Igor
      • @@ -2124,6 +2140,7 @@ xmlOutputBufferCreateOwn(FILE *file, xmlCharEncodingHandlerPtr encoder) { + }
    • And then use it to save the document: @@ -2994,6 +3011,35 @@ has been considerably cleaned up and the conformance to the XML specification has been drastically improved too. Don't take those changes as an excuse to not upgrade, it may cost a lot on the long term ...

      +

      Thread safety

      + +

      Starting with 2.4.7, libxml makes provisions to ensure that concurent +threads can safely work in parallel parsing different documents. There is +however a couple of things to do to ensure it:

      +
        +
      • configure the library accordingly using the --with-threads options
        • +
      • call xmlInitParser() in the "main" thread before using any of the + libxml API (except possibly selecting a different memory allocator)
        • +
      + +

      Note that the thread safety cannot be ensured for multiple threads sharing +the same document, the locking must be done at the application level, libxml +exports a basic mutex and reentrant mutexes API in <libxml/threads.h>. +The parts of the library checked for thread safety are:

      +
        +
      • concurrent loading
        • +
      • file access resolution
        • +
      • catalog access
        • +
      • catalog building
        • +
      • entities lookup/accesses
        • +
      • validation
        • +
      • global variables per-thread override
        • +
      • memory handling
        • +
      + +

      XPath is supposed to be thread safe now, but this wasn't tested +seriously.

      +

      DOM Principles

      DOM stands for the Document diff --git a/doc/xmldtd.html b/doc/xmldtd.html index a0ce478b..fe1d3b38 100644 --- a/doc/xmldtd.html +++ b/doc/xmldtd.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }

    • Entities or no entities
    • Namespaces
    • Upgrading 1.x code
      • +
    • Thread safety
    • DOM Principles
    • A real example
    • Contributions
      • diff --git a/doc/xmlio.html b/doc/xmlio.html index 54d8c1ff..9fb30dba 100644 --- a/doc/xmlio.html +++ b/doc/xmlio.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
    • Entities or no entities
    • Namespaces
    • Upgrading 1.x code
      • +
    • Thread safety
    • DOM Principles
    • A real example
    • Contributions
      • @@ -214,6 +215,7 @@ xmlOutputBufferCreateOwn(FILE *file, xmlCharEncodingHandlerPtr encoder) { + }
    • And then use it to save the document: diff --git a/doc/xmlmem.html b/doc/xmlmem.html index 09b6009e..7366a280 100644 --- a/doc/xmlmem.html +++ b/doc/xmlmem.html @@ -49,6 +49,7 @@ A:link, A:visited, A:active { text-decoration: underline }
    • Entities or no entities
    • Namespaces
    • Upgrading 1.x code
      • +
    • Thread safety
    • DOM Principles
    • A real example
    • Contributions
      • diff --git a/include/libxml/xmlwin32version.h b/include/libxml/xmlwin32version.h index 9b2dbc06..c8a86777 100644 --- a/include/libxml/xmlwin32version.h +++ b/include/libxml/xmlwin32version.h @@ -27,21 +27,21 @@ extern void xmlCheckVersion(int version); * * the version string like "1.2.3" */ -#define LIBXML_DOTTED_VERSION "2.4.6" +#define LIBXML_DOTTED_VERSION "2.4.7" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 1002003 */ -#define LIBXML_VERSION 20406 +#define LIBXML_VERSION 20407 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "1002003" */ -#define LIBXML_VERSION_STRING "20406" +#define LIBXML_VERSION_STRING "20407" /** * LIBXML_TEST_VERSION: @@ -49,7 +49,7 @@ extern void xmlCheckVersion(int version); * Macro to check that the libxml version in use is compatible with * the version the software has been compiled against */ -#define LIBXML_TEST_VERSION xmlCheckVersion(20406); +#define LIBXML_TEST_VERSION xmlCheckVersion(20407); #if 0 /** diff --git a/xmllint.1 b/xmllint.1 deleted file mode 100644 index 2e9b8148..00000000 --- a/xmllint.1 +++ /dev/null @@ -1,113 +0,0 @@ -.TH XMLLINT 1 "12 April 2000" -.SH NAME -xmllint \- parse XML files and print the result of parsing -.SH SYNOPSIS -.B xmllint -.RB [ \-\-compress ] -.RB [ \-\-copy ] -.RB [ \-\-debug ] -.RB [ \-\-debugent ] -.RB [ \-\-htmlout ] -.RB [ \-\-insert ] -.RB [ \-\-noblanks ] -.RB [ \-\-noent ] -.RB [ \-\-noout ] -.RB [ \-\-nowarning ] -.RB [ \-\-nowarp ] -.RB [ \-\-postvalid ] -.RB [ \-\-push ] -.RB [ \-\-recover ] -.RB [ \-\-repeat ] -.RB [ \-\-shell ] -.RB [ \-\-testIO ] -.RB [ \-\-valid ] -.IR xmlfile ... -.SH DESCRIPTION -The -.IR xmllint -program parses one or more XML files, -specified on the command line as -.IR xmlfile .... -It prints various types of output -(depending upon the options selected). -It is useful for detecting errors both in XML code and in the -XML parser itself. -.SH OPTIONS -.TP 12 -.B \-\-compress -Do -.IR gzip (1) -compression for the output. -.TP -.B \-\-copy -Test the internal copy implementation. -.TP -.B \-\-debug -Dump a debug tree of the in-memory document. -.TP -.B \-\-debugent -Debug the entities defined in the document. -.TP -.B \-\-htmlout -Output results in -.I html -format. -.TP -.B \-\-insert -Test for valid insertion. -.TP -.B \-\-noblanks -Drop blanks from the output. -.TP -.B \-\-noent -Substitute entity references by their value. -.TP -.B \-\-noout -Do not output the result tree. -.TP -.B \-\-nowarning -Do not print warning messages from the parser or validator. -.TP -.B \-\-nowarp -Do not put -.I html -document wrapper. -.TP -.B \-\-postvalid -Do a -.I posteriori -validation. -.TP -.B \-\-push -Use the push mode for the parser. -.TP -.B \-\-recover -Output what was parsable on broken XML documents. -.TP -.B \-\-repeat -Repeat the process 100 times, for the purpose of timing and profiling. -.TP -.B \-\-shell -Run a navigating shell. -.TP -.B \-\-testIO -Test user i/o support. -.TP -.B \-\-valid -Validate the document in addition to std well-formed. -.SH RESULT -xmllint will return 1 if the XML is not well formed, 2 if the -Dtd could not be loaded and 3 if the valiadtion fails. If no -error is detected it will return 0. -.SH FILES -.TP 2.2i -.B /depot/package/libxml_2.0.0/bin/xmllint -executable -.SH "SEE ALSO" -.BR libxml (4) -.SH AUTHOR -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). -.\" end of manual page