diff --git a/ChangeLog b/ChangeLog index dc68cf0c..f6c2a0a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Nov 10 12:55:42 CET 2001 Daniel Veillard + + * configure.in include/libxml/xmlwin32version.h: preparing 2.4.10 + * doc/*: upgraded and rebuilt the docs + Sat Nov 10 12:33:38 CET 2001 Daniel Veillard * HTMLparser.c: fix comment in scripts element parsing. diff --git a/configure.in b/configure.in index f77f1c19..756dd399 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=9 +LIBXML_MICRO_VERSION=10 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 46e4b6d2..ca6c0be0 100644 --- a/doc/DOM.html +++ b/doc/DOM.html @@ -1,4 +1,4 @@ - + diff --git a/doc/FAQ.html b/doc/FAQ.html index b3022bfa..af03cb68 100644 --- a/doc/FAQ.html +++ b/doc/FAQ.html @@ -1,4 +1,4 @@ - + diff --git a/doc/XML.html b/doc/XML.html index e2a7d3a4..001d1aae 100644 --- a/doc/XML.html +++ b/doc/XML.html @@ -1,4 +1,4 @@ - + diff --git a/doc/XSLT.html b/doc/XSLT.html index 41902808..88bbad5f 100644 --- a/doc/XSLT.html +++ b/doc/XSLT.html @@ -1,4 +1,4 @@ - + diff --git a/doc/architecture.html b/doc/architecture.html index ed9315aa..b5b06f33 100644 --- a/doc/architecture.html +++ b/doc/architecture.html @@ -1,4 +1,4 @@ - + diff --git a/doc/bugs.html b/doc/bugs.html index f4c92689..fe782ffb 100644 --- a/doc/bugs.html +++ b/doc/bugs.html @@ -1,4 +1,4 @@ - + diff --git a/doc/catalog.html b/doc/catalog.html index e539bb1f..48a1754d 100644 --- a/doc/catalog.html +++ b/doc/catalog.html @@ -1,4 +1,4 @@ - + diff --git a/doc/contribs.html b/doc/contribs.html index 20d17076..07f9a148 100644 --- a/doc/contribs.html +++ b/doc/contribs.html @@ -1,4 +1,4 @@ - + diff --git a/doc/docs.html b/doc/docs.html index 998b6f4e..67ce9d89 100644 --- a/doc/docs.html +++ b/doc/docs.html @@ -1,4 +1,4 @@ - + diff --git a/doc/downloads.html b/doc/downloads.html index d1e5eebd..1790e1d7 100644 --- a/doc/downloads.html +++ b/doc/downloads.html @@ -1,4 +1,4 @@ - + diff --git a/doc/encoding.html b/doc/encoding.html index b51261f8..fea7e369 100644 --- a/doc/encoding.html +++ b/doc/encoding.html @@ -1,4 +1,4 @@ - + diff --git a/doc/entities.html b/doc/entities.html index 986857f1..96923039 100644 --- a/doc/entities.html +++ b/doc/entities.html @@ -1,4 +1,4 @@ - + diff --git a/doc/example.html b/doc/example.html index 59e6f706..c91967a7 100644 --- a/doc/example.html +++ b/doc/example.html @@ -1,4 +1,4 @@ - + diff --git a/doc/help.html b/doc/help.html index 45375025..5de2913c 100644 --- a/doc/help.html +++ b/doc/help.html @@ -1,4 +1,4 @@ - + diff --git a/doc/html/index.sgml b/doc/html/index.sgml index aff063b7..a44473e0 100644 --- a/doc/html/index.sgml +++ b/doc/html/index.sgml @@ -2,7 +2,6 @@ - @@ -11,7 +10,6 @@ - @@ -157,6 +155,14 @@ + + + + + + + + @@ -318,6 +324,9 @@ + + + @@ -489,6 +498,9 @@ + + + @@ -773,13 +785,11 @@ - - @@ -809,10 +819,7 @@ - - - - + @@ -820,6 +827,7 @@ + @@ -831,6 +839,7 @@ + @@ -1111,6 +1120,7 @@ + diff --git a/doc/html/libxml-catalog.html b/doc/html/libxml-catalog.html index 3c141428..29ee56cd 100644 --- a/doc/html/libxml-catalog.html +++ b/doc/html/libxml-catalog.html @@ -123,7 +123,7 @@ NAME="LIBXML-CATALOG" >

Name

Synopsis

xmlCatalogPtr xmlNewCatalog (int sgml); +xmlCatalogPtr xmlLoadACatalog (const char *filename); @@ -299,6 +306,13 @@ HREF="libxml-catalog.html#XMLFREECATALOG" HREF="libxml-catalog.html#XMLCATALOGPTR" >xmlCatalogPtr catal); +int xmlCatalogIsEmpty (xmlCatalogPtr catal); void xmlInitializeCatalog

Description

Details

xmlNewCatalog ()

xmlCatalogPtr xmlNewCatalog                 (int sgml);

create a new Catalog.

sgml : should this create an SGML catalog
Returns :the xmlCatalogPtr or NULL in case of error

xmlCatalogIsEmpty ()

int         xmlCatalogIsEmpty               (xmlCatalogPtr catal);

Check is a catalog is empty

catal : should this create an SGML catalog
Returns :1 if the catalog is empty, 0 if not, amd -1 in case of error.

Name

Synopsis

xmlBoolToText (int bool); +> (int boolval); longxmlNodePtr node); +xmlChar* xmlGetNodePath (xmlNodePtr node); char* (*xmlShellReadlineFunc

Description

Details

const char* xmlBoolToText                   (int bool);
const char* xmlBoolToText (int boolval);

boolboolval :

xmlGetNodePath ()

xmlChar*    xmlGetNodePath                  (xmlNodePtr node);

Build a structure based Path for the given node

node : a node
Returns :the new path or NULL in case of error. The caller must free +the returned string

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

xmlDocPtr cur, + const char *encoding, + int format); +void htmlNodeDumpFormatOutput (xmlOutputBufferPtr buf, + xmlDocPtr doc, + xmlNodePtr cur, + const char *encoding, + int format); +void htmlDocContentDumpOutput (xmlOutputBufferPtr buf, + xmlDocPtr cur, + const char *encoding); +void htmlDocContentDumpFormatOutput (xmlOutputBufferPtr buf, + xmlDocPtr cur, const char *encoding, int format);

Description

Details

htmlNodeDumpFormatOutput ()

void        htmlNodeDumpFormatOutput        (xmlOutputBufferPtr buf,
+                                             xmlDocPtr doc,
+                                             xmlNodePtr cur,
+                                             const char *encoding,
+                                             int format);

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

buf : the HTML buffer output
doc : the document
cur : the current node
encoding : the encoding string
format : should formatting spaces been added

htmlDocContentDumpOutput ()

void        htmlDocContentDumpOutput        (xmlOutputBufferPtr buf,
+                                             xmlDocPtr cur,
+                                             const char *encoding);

Dump an HTML document. Formating return/spaces are added.

buf : the HTML buffer output
cur : the document
encoding : the encoding string

htmlDocContentDumpFormatOutput ()

void        htmlDocContentDumpFormatOutput  (xmlOutputBufferPtr buf,
+                                             xmlDocPtr cur,
+                                             const char *encoding,
+                                             int format);

Dump an HTML document.

buf : the HTML buffer output
cur : the document
encoding : the encoding string
format : 

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

xmlParserInput; -typedef xmlParserInputPtr; struct xmlParserNodeInfoxmlParserCtxt; -typedef xmlParserCtxtPtr; struct xmlSAXLocatorxmlSAXLocatorPtr; xmlParserInputPtr (xmlSAXHandlerPtr; xmlParserInputPtr (xmlParserCtxtPtr context); #define xmlParserInputRead (xmlParserInputPtr in, int len); @@ -548,7 +540,7 @@ int xmlParserInputGrow (xmlParserInputPtr in, int len); @@ -772,7 +764,7 @@ void xmlStopParser (xmlParserCtxtPtr ctxt); int xmlParseDocument (xmlParserCtxtPtr ctxt); int xmlParseExtParsedEnt (xmlParserCtxtPtr ctxt); xmlSAXHandlerPtr sax, xmlParserInputBufferPtr input, xmlParseCtxtExternalEntity (xmlParserCtxtPtr ctx, const xmlInitParserCtxt (xmlParserCtxtPtr ctxt); void xmlClearParserCtxt (xmlParserCtxtPtr ctxt); void xmlFreeParserCtxt (xmlParserCtxtPtr ctxt); void xmlSetupParserForBuffer (xmlParserCtxtPtr ctxt, const *buffer, const char *filename); xmlParserCtxtPtr xmlGetFeature (xmlParserCtxtPtr ctxt, const char *name, @@ -1096,13 +1088,13 @@ int xmlSetFeature (xmlParserCtxtPtr ctxt, const char *name, void *value); xmlParserCtxtPtr xmlParseChunk (xmlParserCtxtPtr ctxt, const char *chunk, int size, int terminate); xmlParserCtxtPtr xmlCharEncoding enc); xmlParserInputPtr xmlNewIOInputStream (xmlParserCtxtPtr ctxt, xmlParserInputBufferPtr input, xmlParserAddNodeInfo (xmlParserCtxtPtr ctxt, const (void); xmlParserInputPtr (const char *URL, const char *ID, xmlParserCtxtPtr context);

Description

Details

xmlParserInputPtr

typedef xmlParserInput *xmlParserInputPtr;

xmlParserCtxtPtr

typedef xmlParserCtxt *xmlParserCtxtPtr;

xmlParserInputPtr (*resolveEntitySAXFunc)   (void *ctx,
                                              const 
xmlParserInputPtr (*xmlExternalEntityLoader)
                                             (const char *URL,
                                              const char *ID,
                                              xmlParserCtxtPtr context);
int         xmlParserInputRead              (xmlParserInputPtr in,
                                              int len);
int         xmlParserInputGrow              (xmlParserInputPtr in,
                                              int len);
void        xmlStopParser                   (xmlParserCtxtPtr ctxt);
int         xmlParseDocument                (xmlParserCtxtPtr ctxt);
int         xmlParseExtParsedEnt            (xmlParserCtxtPtr ctxt);
xmlSAXHandlerPtr sax,
                                              xmlParserInputBufferPtr input,
                                              
int         xmlParseCtxtExternalEntity      (xmlParserCtxtPtr ctx,
                                              const 
void        xmlInitParserCtxt               (xmlParserCtxtPtr ctxt);
void        xmlClearParserCtxt              (xmlParserCtxtPtr ctxt);
void        xmlFreeParserCtxt               (xmlParserCtxtPtr ctxt);
void        xmlSetupParserForBuffer         (xmlParserCtxtPtr ctxt,
                                              const 
xmlParserCtxtPtr xmlCreateDocParserCtxt     (
int         xmlGetFeature                   (xmlParserCtxtPtr ctxt,
                                              const char *name,
@@ -10683,7 +10623,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 >
int         xmlSetFeature                   (xmlParserCtxtPtr ctxt,
                                              const char *name,
@@ -10802,7 +10742,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 >
xmlParserCtxtPtr xmlCreatePushParserCtxt    (
int         xmlParseChunk                   (xmlParserCtxtPtr ctxt,
                                              const char *chunk,
@@ -11093,7 +11033,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 >
xmlParserCtxtPtr xmlCreateIOParserCtxt      (
xmlParserInputPtr xmlNewIOInputStream       (xmlParserCtxtPtr ctxt,
                                              xmlParserInputBufferPtr input,
                                              
void        xmlParserAddNodeInfo            (xmlParserCtxtPtr ctxt,
                                              const 
xmlParserInputPtr xmlLoadExternalEntity     (const char *URL,
                                              const char *ID,
                                              xmlParserCtxtPtr context);
Name
Synopsis
xmlIsChar                       (int c);
 xmlParserCtxtPtr xmlChar *cur);
 xmlParserCtxtPtr xmlCreateFileParserCtxt    (const char *filename);
 xmlParserCtxtPtr   (const char *buffer,
                                              int size);
 xmlParserCtxtPtr xmlNewParserCtxt           (void);
 xmlParserCtxtPtr xmlSwitchEncoding               (xmlParserCtxtPtr ctxt,
                                              xmlSwitchToEncoding             (xmlParserCtxtPtr ctxt,
                                              xmlFreeParserCtxt               (xmlParserCtxtPtr ctxt);
 void        xmlHandleEntity                 (xmlParserCtxtPtr ctxt,
                                              xmlEntityPtr entity);
 xmlParserInputPtr xmlNewStringInputStream   (xmlParserCtxtPtr ctxt,
                                              const xmlChar *buffer);
 xmlParserInputPtr xmlNewEntityInputStream   (xmlParserCtxtPtr ctxt,
                                              xmlPushInput                    (xmlParserCtxtPtr ctxt,
                                              xmlParserInputPtr input);
 xmlPopInput                     (xmlParserCtxtPtr ctxt);
 void        xmlFreeInputStream              (xmlParserInputPtr input);
 xmlParserInputPtr xmlNewInputFromFile       (xmlParserCtxtPtr ctxt,
                                              const char *filename);
 xmlParserInputPtr xmlNewInputStream         (xmlParserCtxtPtr ctxt);
 xmlSplitQName                   (xmlParserCtxtPtr ctxt,
                                              const xmlNamespaceParseNCName         (xmlParserCtxtPtr ctxt);
 xmlNamespaceParseQName          (xmlParserCtxtPtr ctxt,
                                              xmlNamespaceParseNSDef          (xmlParserCtxtPtr ctxt);
 xmlParseQuotedString            (xmlParserCtxtPtr ctxt);
 void        xmlParseNamespace               (xmlParserCtxtPtr ctxt);
 xmlScanName                     (xmlParserCtxtPtr ctxt);
 xmlParseName                    (xmlParserCtxtPtr ctxt);
 xmlParseNmtoken                 (xmlParserCtxtPtr ctxt);
 xmlParseEntityValue             (xmlParserCtxtPtr ctxt,
                                              xmlParseAttValue                (xmlParserCtxtPtr ctxt);
 xmlParseSystemLiteral           (xmlParserCtxtPtr ctxt);
 xmlParsePubidLiteral            (xmlParserCtxtPtr ctxt);
 void        xmlParseCharData                (xmlParserCtxtPtr ctxt,
                                              int cdata);
@@ -563,7 +563,7 @@ HREF="libxml-tree.html#XMLCHAR"
 HREF="libxml-parserinternals.html#XMLPARSEEXTERNALID"
 >xmlParseExternalID              (xmlParserCtxtPtr ctxt,
                                              xmlParseComment                 (xmlParserCtxtPtr ctxt);
 xmlParsePITarget                (xmlParserCtxtPtr ctxt);
 void        xmlParsePI                      (xmlParserCtxtPtr ctxt);
 void        xmlParseNotationDecl            (xmlParserCtxtPtr ctxt);
 void        xmlParseEntityDecl              (xmlParserCtxtPtr ctxt);
 int         xmlParseDefaultDecl             (xmlParserCtxtPtr ctxt,
                                              xmlParseNotationType      (xmlParserCtxtPtr ctxt);
 xmlParseEnumerationType   (xmlParserCtxtPtr ctxt);
 int         xmlParseEnumeratedType          (xmlParserCtxtPtr ctxt,
                                              xmlParseAttributeType           (xmlParserCtxtPtr ctxt,
                                              xmlParseAttributeListDecl       (xmlParserCtxtPtr ctxt);
 xmlParseElementMixedContentDecl
                                             (xmlParserCtxtPtr ctxt);
 xmlParseElementChildrenContentD
                                             (xmlParserCtxtPtr ctxt);
 xmlParseElementChildrenContentDecl
                                             (xmlParserCtxtPtr ctxt);
 int         xmlParseElementContentDecl      (xmlParserCtxtPtr ctxt,
                                              xmlParseElementDecl             (xmlParserCtxtPtr ctxt);
 void        xmlParseMarkupDecl              (xmlParserCtxtPtr ctxt);
 int         xmlParseCharRef                 (xmlParserCtxtPtr ctxt);
 xmlParseEntityRef              (xmlParserCtxtPtr ctxt);
 void        xmlParseReference               (xmlParserCtxtPtr ctxt);
 void        xmlParsePEReference             (xmlParserCtxtPtr ctxt);
 void        xmlParseDocTypeDecl             (xmlParserCtxtPtr ctxt);
 xmlParseAttribute               (xmlParserCtxtPtr ctxt,
                                              xmlParseStartTag                (xmlParserCtxtPtr ctxt);
 void        xmlParseEndTag                  (xmlParserCtxtPtr ctxt);
 void        xmlParseCDSect                  (xmlParserCtxtPtr ctxt);
 void        xmlParseContent                 (xmlParserCtxtPtr ctxt);
 void        xmlParseElement                 (xmlParserCtxtPtr ctxt);
 xmlParseVersionNum              (xmlParserCtxtPtr ctxt);
 xmlParseVersionInfo             (xmlParserCtxtPtr ctxt);
 xmlParseEncName                 (xmlParserCtxtPtr ctxt);
 xmlParseEncodingDecl            (xmlParserCtxtPtr ctxt);
 int         xmlParseSDDecl                  (xmlParserCtxtPtr ctxt);
 void        xmlParseXMLDecl                 (xmlParserCtxtPtr ctxt);
 void        xmlParseTextDecl                (xmlParserCtxtPtr ctxt);
 void        xmlParseMisc                    (xmlParserCtxtPtr ctxt);
 void        xmlParseExternalSubset          (xmlParserCtxtPtr ctxt,
                                              const xmlDecodeEntities               (xmlParserCtxtPtr ctxt,
                                              int len,
@@ -951,7 +951,7 @@ HREF="libxml-tree.html#XMLCHAR"
 HREF="libxml-parserinternals.html#XMLSTRINGDECODEENTITIES"
 >xmlStringDecodeEntities         (xmlParserCtxtPtr ctxt,
                                              const nodePush                        (xmlParserCtxtPtr ctxt,
                                              nodePop                         (xmlParserCtxtPtr ctxt);
 int         inputPush                       (xmlParserCtxtPtr ctxt,
                                              xmlParserInputPtr value);
 xmlParserInputPtr inputPop                  (xmlParserCtxtPtr ctxt);
 namePop                         (xmlParserCtxtPtr ctxt);
 int         namePush                        (xmlParserCtxtPtr ctxt,
                                              xmlSkipBlankChars               (xmlParserCtxtPtr ctxt);
 int         xmlStringCurrentChar            (xmlParserCtxtPtr ctxt,
                                              const xmlParserHandlePEReference      (xmlParserCtxtPtr ctxt);
 void        xmlParserHandleReference        (xmlParserCtxtPtr ctxt);
 int         xmlCurrentChar                  (xmlParserCtxtPtr ctxt,
                                              int *len);
@@ -1103,14 +1103,14 @@ void        xmlNextChar                     (xmlParserCtxtPtr ctxt);
 void        xmlParserInputShrink            (xmlParserInputPtr in);
 void        
Description
Details
xmlParserCtxtPtr xmlCreateDocParserCtxt     (
xmlParserCtxtPtr xmlCreateFileParserCtxt    (const char *filename);
xmlParserCtxtPtr xmlCreateMemoryParserCtxt  (const char *buffer,
                                              int size);
xmlParserCtxtPtr xmlNewParserCtxt           (void);
xmlParserCtxtPtr xmlCreateEntityParserCtxt  (const 
int         xmlSwitchEncoding               (xmlParserCtxtPtr ctxt,
                                              
int         xmlSwitchToEncoding             (xmlParserCtxtPtr ctxt,
                                              
void        xmlFreeParserCtxt               (xmlParserCtxtPtr ctxt);
void        xmlHandleEntity                 (xmlParserCtxtPtr ctxt,
                                              
xmlParserInputPtr xmlNewStringInputStream   (xmlParserCtxtPtr ctxt,
                                              const 
xmlParserInputPtr xmlNewEntityInputStream   (xmlParserCtxtPtr ctxt,
                                              
void        xmlPushInput                    (xmlParserCtxtPtr ctxt,
                                              xmlParserInputPtr input);
xmlChar     xmlPopInput                     (xmlParserCtxtPtr ctxt);
void        xmlFreeInputStream              (xmlParserInputPtr input);
xmlParserInputPtr xmlNewInputFromFile       (xmlParserCtxtPtr ctxt,
                                              const char *filename);
xmlParserInputPtr xmlNewInputStream         (xmlParserCtxtPtr ctxt);
xmlChar*    xmlSplitQName                   (xmlParserCtxtPtr ctxt,
                                              const 
xmlChar*    xmlNamespaceParseNCName         (xmlParserCtxtPtr ctxt);
xmlChar*    xmlNamespaceParseQName          (xmlParserCtxtPtr ctxt,
                                              
xmlChar*    xmlNamespaceParseNSDef          (xmlParserCtxtPtr ctxt);
xmlChar*    xmlParseQuotedString            (xmlParserCtxtPtr ctxt);
void        xmlParseNamespace               (xmlParserCtxtPtr ctxt);
xmlChar*    xmlScanName                     (xmlParserCtxtPtr ctxt);
xmlChar*    xmlParseName                    (xmlParserCtxtPtr ctxt);
xmlChar*    xmlParseNmtoken                 (xmlParserCtxtPtr ctxt);
xmlChar*    xmlParseEntityValue             (xmlParserCtxtPtr ctxt,
                                              
xmlChar*    xmlParseAttValue                (xmlParserCtxtPtr ctxt);
xmlChar*    xmlParseSystemLiteral           (xmlParserCtxtPtr ctxt);
xmlChar*    xmlParsePubidLiteral            (xmlParserCtxtPtr ctxt);
void        xmlParseCharData                (xmlParserCtxtPtr ctxt,
                                              int cdata);
xmlChar*    xmlParseExternalID              (xmlParserCtxtPtr ctxt,
                                              
void        xmlParseComment                 (xmlParserCtxtPtr ctxt);
xmlChar*    xmlParsePITarget                (xmlParserCtxtPtr ctxt);
void        xmlParsePI                      (xmlParserCtxtPtr ctxt);
void        xmlParseNotationDecl            (xmlParserCtxtPtr ctxt);
void        xmlParseEntityDecl              (xmlParserCtxtPtr ctxt);
int         xmlParseDefaultDecl             (xmlParserCtxtPtr ctxt,
                                              
xmlEnumerationPtr xmlParseNotationType      (xmlParserCtxtPtr ctxt);
xmlEnumerationPtr xmlParseEnumerationType   (xmlParserCtxtPtr ctxt);
int         xmlParseEnumeratedType          (xmlParserCtxtPtr ctxt,
                                              
int         xmlParseAttributeType           (xmlParserCtxtPtr ctxt,
                                              
void        xmlParseAttributeListDecl       (xmlParserCtxtPtr ctxt);
xmlElementContentPtr xmlParseElementMixedContentDecl
                                             (xmlParserCtxtPtr ctxt);
xmlElementContentPtr xmlParseElementChildrenContentD
                                             (xmlParserCtxtPtr ctxt);
xmlElementContentPtr xmlParseElementChildrenContentDecl
                                             (xmlParserCtxtPtr ctxt);
int         xmlParseElementContentDecl      (xmlParserCtxtPtr ctxt,
                                              
int         xmlParseElementDecl             (xmlParserCtxtPtr ctxt);
void        xmlParseMarkupDecl              (xmlParserCtxtPtr ctxt);
int         xmlParseCharRef                 (xmlParserCtxtPtr ctxt);
xmlEntityPtr xmlParseEntityRef              (xmlParserCtxtPtr ctxt);
void        xmlParseReference               (xmlParserCtxtPtr ctxt);
void        xmlParsePEReference             (xmlParserCtxtPtr ctxt);
void        xmlParseDocTypeDecl             (xmlParserCtxtPtr ctxt);
xmlChar*    xmlParseAttribute               (xmlParserCtxtPtr ctxt,
                                              
xmlChar*    xmlParseStartTag                (xmlParserCtxtPtr ctxt);
void        xmlParseEndTag                  (xmlParserCtxtPtr ctxt);
void        xmlParseCDSect                  (xmlParserCtxtPtr ctxt);
void        xmlParseContent                 (xmlParserCtxtPtr ctxt);
void        xmlParseElement                 (xmlParserCtxtPtr ctxt);
xmlChar*    xmlParseVersionNum              (xmlParserCtxtPtr ctxt);
xmlChar*    xmlParseVersionInfo             (xmlParserCtxtPtr ctxt);
xmlChar*    xmlParseEncName                 (xmlParserCtxtPtr ctxt);
xmlChar*    xmlParseEncodingDecl            (xmlParserCtxtPtr ctxt);

int         xmlParseSDDecl                  (xmlParserCtxtPtr ctxt);

void        xmlParseXMLDecl                 (xmlParserCtxtPtr ctxt);

void        xmlParseTextDecl                (xmlParserCtxtPtr ctxt);

void        xmlParseMisc                    (xmlParserCtxtPtr ctxt);

void        xmlParseExternalSubset          (xmlParserCtxtPtr ctxt,
                                              const 
xmlChar*    xmlDecodeEntities               (xmlParserCtxtPtr ctxt,
                                              int len,
@@ -9594,7 +9594,7 @@ through xmlStringDecodeEntities
xmlChar*    xmlStringDecodeEntities         (xmlParserCtxtPtr ctxt,
                                              const 
int         nodePush                        (xmlParserCtxtPtr ctxt,
                                              
xmlNodePtr  nodePop                         (xmlParserCtxtPtr ctxt);
int         inputPush                       (xmlParserCtxtPtr ctxt,
                                              xmlParserInputPtr value);
xmlParserInputPtr inputPop                  (xmlParserCtxtPtr ctxt);
xmlChar*    namePop                         (xmlParserCtxtPtr ctxt);

int         namePush                        (xmlParserCtxtPtr ctxt,
                                              
int         xmlSkipBlankChars               (xmlParserCtxtPtr ctxt);
int         xmlStringCurrentChar            (xmlParserCtxtPtr ctxt,
                                              const 
void        xmlParserHandlePEReference      (xmlParserCtxtPtr ctxt);
void        xmlParserHandleReference        (xmlParserCtxtPtr ctxt);
int         xmlCurrentChar                  (xmlParserCtxtPtr ctxt,
                                              int *len);
void        xmlNextChar                     (xmlParserCtxtPtr ctxt);
void        xmlParserInputShrink            (xmlParserInputPtr in);
Name
Synopsis
xmlChar *name);
 xmlParserInputPtr 
Description
Details
xmlParserInputPtr resolveEntity             (void *ctx,
                                              const 
Name
Synopsis

 
+struct      xmlParserInputBuffer;
+typedef     xmlParserInputBufferPtr;
+struct      xmlOutputBuffer;
+typedef     xmlOutputBufferPtr;
+struct      xmlParserInput;
+typedef     xmlParserInputPtr;
+struct      xmlParserCtxt;
+typedef     xmlParserCtxtPtr;
 #define     BASE_BUFFER_SIZExmlSaveFileTo                   (xmlOutputBufferPtr buf,
+                                             xmlDocPtr cur,
+                                             const char *encoding);
+int         xmlSaveFormatFileTo             (xmlOutputBufferPtr buf,
+                                             xmlDocPtr cur,
+                                             const char *encoding,
+                                             int format);
+void        xmlNodeDumpOutput               (xmlOutputBufferPtr buf,
+                                             xmlDocPtr doc,
+                                             xmlNodePtr cur,
+                                             int level,
+                                             int format,
+                                             const char *encoding);
+int         xmlSaveFormatFileEnc            (const char *filename,
@@ -1820,7 +1895,7 @@ HREF="libxml-tree.html#XMLSETCOMPRESSMODE"
 >
Description
Details
struct xmlParserInputBuffer
struct xmlParserInputBuffer {
+    void*                  context;
+    xmlInputReadCallback   readcallback;
+    xmlInputCloseCallback  closecallback;
+    
+    xmlCharEncodingHandlerPtr encoder; /* I18N conversions to UTF-8 */
+    
+    xmlBufferPtr buffer;    /* Local buffer encoded in UTF-8 */
+    xmlBufferPtr raw;       /* if encoder != NULL buffer for raw input */
+};
xmlParserInputBufferPtr
typedef xmlParserInputBuffer *xmlParserInputBufferPtr;
struct xmlOutputBuffer
struct xmlOutputBuffer {
+    void*                   context;
+    xmlOutputWriteCallback  writecallback;
+    xmlOutputCloseCallback  closecallback;
+    
+    xmlCharEncodingHandlerPtr encoder; /* I18N conversions to UTF-8 */
+    
+    xmlBufferPtr buffer;    /* Local buffer encoded in UTF-8 or ISOLatin */
+    xmlBufferPtr conv;      /* if encoder != NULL buffer for output */
+    int written;            /* total number of byte written */
+};
xmlOutputBufferPtr
typedef xmlOutputBuffer *xmlOutputBufferPtr;
struct xmlParserInput
struct xmlParserInput {
+    /* Input buffer */
+    xmlParserInputBufferPtr buf;      /* UTF-8 encoded buffer */
+
+    const char *filename;             /* The file analyzed, if any */
+    const char *directory;            /* the directory/base of the file */
+    const xmlChar *base;              /* Base of the array to parse */
+    const xmlChar *cur;               /* Current char being parsed */
+    const xmlChar *end;               /* end of the arry to parse */
+    int length;                       /* length if known */
+    int line;                         /* Current line */
+    int col;                          /* Current column */
+    int consumed;                     /* How many xmlChars already consumed */
+    xmlParserInputDeallocate free;    /* function to deallocate the base */
+    const xmlChar *encoding;          /* the encoding string for entity */
+    const xmlChar *version;           /* the version string for entity */
+    int standalone;                   /* Was that entity marked standalone */
+};
an xmlParserInput is an input flow for the XML processor.
+Each entity parsed is associated an xmlParserInput (except the
+few predefined ones). This is the case both for internal entities
+- in which case the flow is already completely in memory - or
+external entities - in which case we use the buf structure for
+progressive reading and I18N conversions to the internal UTF-8 format.
xmlParserInputPtr
typedef xmlParserInput *xmlParserInputPtr;
struct xmlParserCtxt
struct xmlParserCtxt {
+    struct _xmlSAXHandler *sax;       /* The SAX handler */
+    void            *userData;        /* For SAX interface only, used by DOM build */
+    xmlDocPtr           myDoc;        /* the document being built */
+    int            wellFormed;        /* is the document well formed */
+    int       replaceEntities;        /* shall we replace entities ? */
+    const xmlChar    *version;        /* the XML version string */
+    const xmlChar   *encoding;        /* the declared encoding, if any */
+    int            standalone;        /* standalone document */
+    int                  html;        /* an HTML(1)/Docbook(2) document */
+
+    /* Input stream stack */
+    xmlParserInputPtr  input;         /* Current input stream */
+    int                inputNr;       /* Number of current input streams */
+    int                inputMax;      /* Max number of input streams */
+    xmlParserInputPtr *inputTab;      /* stack of inputs */
+
+    /* Node analysis stack only used for DOM building */
+    xmlNodePtr         node;          /* Current parsed Node */
+    int                nodeNr;        /* Depth of the parsing stack */
+    int                nodeMax;       /* Max depth of the parsing stack */
+    xmlNodePtr        *nodeTab;       /* array of nodes */
+
+    int record_info;                  /* Whether node info should be kept */
+    xmlParserNodeInfoSeq node_seq;    /* info about each node parsed */
+
+    int errNo;                        /* error code */
+
+    int     hasExternalSubset;        /* reference and external subset */
+    int             hasPErefs;        /* the internal subset has PE refs */
+    int              external;        /* are we parsing an external entity */
+
+    int                 valid;        /* is the document valid */
+    int              validate;        /* shall we try to validate ? */
+    xmlValidCtxt        vctxt;        /* The validity context */
+
+    xmlParserInputState instate;      /* current type of input */
+    int                 token;        /* next char look-ahead */    
+
+    char           *directory;        /* the data directory */
+
+    /* Node name stack */
+    xmlChar           *name;          /* Current parsed Node */
+    int                nameNr;        /* Depth of the parsing stack */
+    int                nameMax;       /* Max depth of the parsing stack */
+    xmlChar *         *nameTab;       /* array of nodes */
+
+    long               nbChars;       /* number of xmlChar processed */
+    long            checkIndex;       /* used by progressive parsing lookup */
+    int             keepBlanks;       /* ugly but ... */
+    int             disableSAX;       /* SAX callbacks are disabled */
+    int               inSubset;       /* Parsing is in int 1/ext 2 subset */
+    xmlChar *          intSubName;    /* name of subset */
+    xmlChar *          extSubURI;     /* URI of external subset */
+    xmlChar *          extSubSystem;  /* SYSTEM ID of external subset */
+
+    /* xml:space values */
+    int *              space;         /* Should the parser preserve spaces */
+    int                spaceNr;       /* Depth of the parsing stack */
+    int                spaceMax;      /* Max depth of the parsing stack */
+    int *              spaceTab;      /* array of space infos */
+
+    int                depth;         /* to prevent entity substitution loops */
+    xmlParserInputPtr  entity;        /* used to check entities boundaries */
+    int                charset;       /* encoding of the in-memory content
+				         actually an xmlCharEncoding */
+    int                nodelen;       /* Those two fields are there to */
+    int                nodemem;       /* Speed up large node parsing */
+    int                pedantic;      /* signal pedantic warnings */
+    void              *_private;      /* For user data, libxml won't touch it */
+
+    int                loadsubset;    /* should the external subset be loaded */
+    int                linenumbers;   /* set line number in element content */
+    void              *catalogs;       /* document's own catalog */
+};
The parser context.
+NOTE This doesn't completely defines the parser state, the (current ?)
+design of the parser uses recursive function calls since this allow
+and easy mapping from the production rules of the specification
+to the actual code. The drawback is that the actual function call
+also reflect the parser state. However most of the parsing routines
+takes as the only argument the parser context pointer, so migrating
+to a state based parser for progressive parsing shouldn't be too hard.
xmlParserCtxtPtr
typedef xmlParserCtxt *xmlParserCtxtPtr;
xmlSaveFileTo ()
int         xmlSaveFileTo                   (xmlOutputBufferPtr buf,
+                                             xmlDocPtr cur,
+                                             const char *encoding);
Dump an XML document to an I/O buffer.
buf :  an output I/O buffer
cur :  the document
encoding :  the encoding if any assuming the i/O layer handles the trancoding
Returns : the number of byte written or -1 in case of failure.
xmlSaveFormatFileTo ()
int         xmlSaveFormatFileTo             (xmlOutputBufferPtr buf,
+                                             xmlDocPtr cur,
+                                             const char *encoding,
+                                             int format);
Dump an XML document to an I/O buffer.
buf :  an output I/O buffer
cur :  the document
encoding :  the encoding if any assuming the i/O layer handles the trancoding
format : should formatting spaces been added
Returns : the number of byte written or -1 in case of failure.
xmlNodeDumpOutput ()
void        xmlNodeDumpOutput               (xmlOutputBufferPtr buf,
+                                             xmlDocPtr doc,
+                                             xmlNodePtr cur,
+                                             int level,
+                                             int format,
+                                             const char *encoding);
Dump an XML node, recursive behaviour,children are printed too.
buf :  the XML buffer output
doc :  the document
cur :  the current node
level : the imbrication level for indenting
format : is formatting allowed
encoding :  an optional encoding string
Name
Synopsis
Description
Details
Name
Synopsis
Description
Details
Name
Synopsis
Description
Details
Name
Synopsis
xmlParserPrintFileInfo          (xmlParserInputPtr input);
 void        xmlParserPrintFileContext       (xmlParserInputPtr input);
Description
Details
void        xmlParserPrintFileInfo          (xmlParserInputPtr input);
void        xmlParserPrintFileContext       (xmlParserInputPtr input);
Name
Synopsis
*xmlInputCloseCallback)        (void *context);
 struct      xmlParserInputBuffer;
-typedef     xmlParserInputBufferPtr;
 int         (*xmlOutputMatchCallback*xmlOutputCloseCallback)       (void *context);
 struct      xmlOutputBuffer;
-typedef     xmlOutputBufferPtr;
 void        xmlCleanupInputCallbacks
                                             (void);
 xmlParserInputBufferPtr xmlCharEncoding enc);
 xmlParserInputBufferPtr xmlCharEncoding enc);
 xmlParserInputBufferPtr xmlCharEncoding enc);
 xmlParserInputBufferPtr xmlCharEncoding enc);
 xmlParserInputBufferPtr xmlCharEncoding enc);
 xmlParserInputBufferPtr xmlCharEncoding enc);
 xmlParserInputBufferPtr xmlParserInputBufferRead        (xmlParserInputBufferPtr in,
                                              int len);
@@ -318,7 +310,7 @@ int         xmlParserInputBufferGrow        (xmlParserInputBufferPtr in,
                                              int len);
@@ -326,7 +318,7 @@ int         xmlParserInputBufferPush        (xmlParserInputBufferPtr in,
                                              int len,
@@ -335,7 +327,7 @@ void        xmlFreeParserInputBuffer        (xmlParserInputBufferPtr in);
 char*       
                                             (void);
 xmlOutputBufferPtr xmlCharEncodingHandlerPtr encoder);
 xmlOutputBufferPtr  encoder,
                                              int compression);
 xmlOutputBufferPtr xmlCharEncodingHandlerPtr encoder);
 xmlOutputBufferPtr xmlCharEncodingHandlerPtr encoder);
 xmlOutputBufferPtr xmlOutputBufferWrite            (xmlOutputBufferPtr out,
                                              int len,
@@ -447,7 +439,7 @@ int         xmlOutputBufferWriteString      (xmlOutputBufferPtr out,
                                              const char *str);
@@ -455,14 +447,14 @@ int         xmlOutputBufferFlush            (xmlOutputBufferPtr out);
 int         xmlOutputBufferClose            (xmlOutputBufferPtr out);
 int         xmlRegisterHTTPPostCallbacks    (void);
-int         xmlSaveFileTo                   (xmlOutputBuffer *buf,
+xmlParserInputPtr xmlNoNetExternalEntityLoader
+                                            (const char *URL,
+                                             const char *ID,
                                              xmlDocPtr cur,
-                                             const char *encoding);
-int         xmlSaveFormatFileTo             (xmlOutputBuffer *buf,
-                                             xmlDocPtr cur,
-                                             const char *encoding,
-                                             int format);
-void        xmlNodeDumpOutput               (xmlOutputBufferPtr buf,
-                                             xmlDocPtr doc,
-                                             xmlNodePtr cur,
-                                             int level,
-                                             int format,
-                                             const char *encoding);
-void        htmlDocContentDumpOutput        (xmlOutputBufferPtr buf,
-                                             xmlDocPtr cur,
-                                             const char *encoding);
xmlParserCtxtPtr ctxt);

Description

Details

xmlParserInputBufferPtr

typedef xmlParserInputBuffer *xmlParserInputBufferPtr;

xmlOutputBufferPtr

typedef xmlOutputBuffer *xmlOutputBufferPtr;

xmlParserInputBufferPtr xmlAllocParserInputBuffer
                                             (
xmlParserInputBufferPtr xmlParserInputBufferCreateFname
                                             (const char *URI,
@@ -1573,7 +1471,7 @@ HREF="libxml-xmlio.html#XMLPARSERINPUTBUFFERCREATEFILENAME"
 >
xmlParserInputBufferPtr xmlParserInputBufferCreateFilename
                                             (const char *URI,
@@ -1682,7 +1580,7 @@ Do an encoding check if enc == XML_CHAR_ENCODING_NONE
xmlParserInputBufferPtr xmlParserInputBufferCreateFile
                                             (
xmlParserInputBufferPtr xmlParserInputBufferCreateFd
                                             (int fd,
@@ -1897,7 +1795,7 @@ from a file descriptor
xmlParserInputBufferPtr xmlParserInputBufferCreateMem
                                             (const char *mem,
@@ -2004,7 +1902,7 @@ from a memory area.
xmlParserInputBufferPtr xmlParserInputBufferCreateIO
                                             (
int         xmlParserInputBufferRead        (xmlParserInputBufferPtr in,
                                              int len);
int         xmlParserInputBufferGrow        (xmlParserInputBufferPtr in,
                                              int len);
int         xmlParserInputBufferPush        (xmlParserInputBufferPtr in,
                                              int len,
@@ -2484,7 +2382,7 @@ This is used when operating the parser in progressive (push) mode.
void        xmlFreeParserInputBuffer        (xmlParserInputBufferPtr in);
xmlOutputBufferPtr xmlAllocOutputBuffer     (
xmlOutputBufferPtr xmlOutputBufferCreateFilename
                                             (const char *URI,
@@ -3022,7 +2920,7 @@ writing to a local file.
xmlOutputBufferPtr xmlOutputBufferCreateFile
                                             (
xmlOutputBufferPtr xmlOutputBufferCreateFd  (int fd,
                                              
xmlOutputBufferPtr xmlOutputBufferCreateIO  (
int         xmlOutputBufferWrite            (xmlOutputBufferPtr out,
                                              int len,
@@ -3505,7 +3403,7 @@ or delayed writes.
int         xmlOutputBufferWriteString      (xmlOutputBufferPtr out,
                                              const char *str);
int         xmlOutputBufferFlush            (xmlOutputBufferPtr out);
int         xmlOutputBufferClose            (xmlOutputBufferPtr out);
xmlSaveFileTo ()
xmlNoNetExternalEntityLoader ()
int         xmlSaveFileTo                   (xmlOutputBuffer *buf,
+>xmlParserInputPtr xmlNoNetExternalEntityLoader
+                                            (const char *URL,
+                                             const char *ID,
                                              xmlDocPtr cur,
-                                             const char *encoding);
xmlParserCtxtPtr ctxt);
Dump an XML document to an I/O buffer.
A specific entity loader disabling network accesses, though still
+allowing local catalog accesses for resolution.
bufURL :  an output I/O buffer  the URL for the entity to loadcurID :  the document  the System ID for the entity to loadencodingctxt :  the encoding if any assuming the i/O layer handles the trancoding  the context in which the entity is called or NULL the number of byte written or -1 in case of failure.
xmlSaveFormatFileTo ()
int         xmlSaveFormatFileTo             (xmlOutputBuffer *buf,
-                                             xmlDocPtr cur,
-                                             const char *encoding,
-                                             int format);
Dump an XML document to an I/O buffer.
buf :  an output I/O buffer
cur :  the document
encoding :  the encoding if any assuming the i/O layer handles the trancoding
format : should formatting spaces been added
Returns : the number of byte written or -1 in case of failure.
xmlNodeDumpOutput ()
void        xmlNodeDumpOutput               (xmlOutputBufferPtr buf,
-                                             xmlDocPtr doc,
-                                             xmlNodePtr cur,
-                                             int level,
-                                             int format,
-                                             const char *encoding);
Dump an XML node, recursive behaviour,children are printed too.
buf :  the XML buffer output
doc :  the document
cur :  the current node
level : the imbrication level for indenting
format : is formatting allowed
encoding :  an optional encoding string
htmlDocContentDumpOutput ()
void        htmlDocContentDumpOutput        (xmlOutputBufferPtr buf,
-                                             xmlDocPtr cur,
-                                             const char *encoding);
Dump an HTML document. Formating return/spaces are added.
a new allocated xmlParserInputPtr, or NULL.
buf :  the HTML buffer output
cur :  the document
encoding :  the encoding string
Name
Synopsis
Description
Details
Name
Synopsis
Description
Details
Name
Synopsis
Description
Details
Name
Synopsis
Description
Details

+
 
 
 
diff --git a/doc/interface.html b/doc/interface.html
index 6adc52ba..ad350b4b 100644
--- a/doc/interface.html
+++ b/doc/interface.html
@@ -1,4 +1,4 @@
-
+
 
 
 
diff --git a/doc/intro.html b/doc/intro.html
index f253a8c7..c5358a52 100644
--- a/doc/intro.html
+++ b/doc/intro.html
@@ -1,4 +1,4 @@
-
+
 
 
 
diff --git a/doc/library.html b/doc/library.html
index 4bda13bb..a5333248 100644
--- a/doc/library.html
+++ b/doc/library.html
@@ -1,4 +1,4 @@
-
+
 
 
 
diff --git a/doc/namespaces.html b/doc/namespaces.html
index ae293f92..2a29996e 100644
--- a/doc/namespaces.html
+++ b/doc/namespaces.html
@@ -1,4 +1,4 @@
-
+
 
 
 
diff --git a/doc/news.html b/doc/news.html
index 0572c2ec..fdc17e2f 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -1,4 +1,4 @@
-
+
 
 
 
@@ -84,6 +84,21 @@ you want to test those

 
  • (seeems working but delayed from release) parsing/import of Docbook
     SGML docs
    • 
 
+
    2.4.10: Nov 10 2001
    
+
      
+
    • URI escaping fix (Joel Young)
      • 
+
    • added xmlGetNodePath() (for paths or XPointers generation)
      • 
+
    • Fixes namespace handling problems when using DTD and validation
      • 
+
    • improvements on xmllint: Morus Walter patches for --format and
+    --encode, Stefan Kost and Heiko Rupp improvements on the --shell
      • 
+
    • fixes for xmlcatalog linking pointed by Weiqi Gao
      • 
+
    • fixes to the HTML parser
      • 
+
    
+
    2.4.9: Nov 6 2001
    
+
      
+
    • fixes more catalog bugs
      • 
+
    • avoid a compilation problem, improve xmlGetLineNo()
      • 
+
    
 
    2.4.8: Nov 4 2001
    
 
      
 
    • fixed SGML catalogs broken in previous release, updated xmlcatalog
diff --git a/doc/threads.html b/doc/threads.html
index 048235b2..418cfe95 100644
--- a/doc/threads.html
+++ b/doc/threads.html
@@ -1,4 +1,4 @@
-
+
 
 
 
diff --git a/doc/tree.html b/doc/tree.html
index 7fd0d772..3765a598 100644
--- a/doc/tree.html
+++ b/doc/tree.html
@@ -1,4 +1,4 @@
-
+
 
 
 
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 47212d2e..d1f6fb6d 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -1,4 +1,4 @@
-
+
 
 
 
diff --git a/doc/xml.html b/doc/xml.html
index 205528f4..4265fe3c 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -559,6 +559,23 @@ you want to test those
      
     SGML docs
      • 
 
    
 
+
    2.4.10: Nov 10 2001
    
+
      
+  
    • URI escaping fix (Joel Young)
      • 
+  
    • added xmlGetNodePath() (for paths or XPointers generation)
      • 
+  
    • Fixes namespace handling problems when using DTD and validation
      • 
+  
    • improvements on xmllint: Morus Walter patches for --format and
+    --encode, Stefan Kost and Heiko Rupp improvements on the --shell
      • 
+  
    • fixes for xmlcatalog linking pointed by Weiqi Gao
      • 
+  
    • fixes to the HTML parser
      • 
+
    
+
+
    2.4.9: Nov 6 2001
    
+
      
+  
    • fixes more catalog bugs
      • 
+  
    • avoid a compilation problem, improve xmlGetLineNo()
      • 
+
    
+
 
    2.4.8: Nov 4 2001
    
 
      
   
    • fixed SGML catalogs broken in previous release, updated xmlcatalog
@@ -2149,6 +2166,7 @@ xmlOutputBufferCreateOwn(FILE *file, xmlCharEncodingHandlerPtr encoder) {
 
 
 
+
 } 
    
   
   
  • And then use it to save the document:
diff --git a/doc/xmldtd.html b/doc/xmldtd.html
index fe1d3b38..b94ccdc5 100644
--- a/doc/xmldtd.html
+++ b/doc/xmldtd.html
@@ -1,4 +1,4 @@
-
+
 
 
 
diff --git a/doc/xmlio.html b/doc/xmlio.html
index 483c9ed7..0be0d862 100644
--- a/doc/xmlio.html
+++ b/doc/xmlio.html
@@ -1,4 +1,4 @@
-
+
 
 
 
@@ -217,6 +217,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 7366a280..2da80104 100644
--- a/doc/xmlmem.html
+++ b/doc/xmlmem.html
@@ -1,4 +1,4 @@
-
+
 
 
 
diff --git a/include/libxml/xmlwin32version.h b/include/libxml/xmlwin32version.h
index 3254995a..945a2dfd 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.9"
+#define LIBXML_DOTTED_VERSION "2.4.10"
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 1002003
  */
-#define LIBXML_VERSION 20409
+#define LIBXML_VERSION 20410
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "1002003"
  */
-#define LIBXML_VERSION_STRING "20409"
+#define LIBXML_VERSION_STRING "20410"
 
 /**
  * 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(20409);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20410);
 
 #if 0
 /**
diff --git a/uri.c b/uri.c
index 2aa9496b..ab547f5a 100644
--- a/uri.c
+++ b/uri.c
@@ -1004,10 +1004,9 @@ xmlURIEscape(const xmlChar * str)
     if (uri->port) {
         xmlChar port[10];
 
-        snprintf((char *) segment, 10, "%d", uri->port);
+        snprintf((char *) port, 10, "%d", uri->port);
         ret = xmlStrcat(ret, BAD_CAST ":");
         ret = xmlStrcat(ret, port);
-        xmlFree(segment);
     }
 
     if (uri->path) {
@@ -1042,6 +1041,8 @@ xmlURIEscape(const xmlChar * str)
         ret = xmlStrcat(ret, segment);
         xmlFree(segment);
     }
+
+    xmlFreeURI(uri);
 #undef NULLCHK
 
     return (ret);