From 1a380b89245faf223c366d81b16fb9254bbe1b83 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Thu, 21 Oct 2004 16:00:06 +0000 Subject: [PATCH] fixed a memory bug added test from Graham Bennett and regenerated the * xmlschemas.c: fixed a memory bug * doc/examples/reader4.c doc/examples/*: added test from Graham Bennett and regenerated the directory Daniel --- ChangeLog | 6 ++ doc/examples/.cvsignore | 1 + doc/examples/Makefile.am | 9 ++- doc/examples/examples.xml | 29 +++++++++ doc/examples/index.html | 4 +- doc/examples/reader4.c | 122 ++++++++++++++++++++++++++++++++++++++ xmlschemas.c | 4 +- 7 files changed, 170 insertions(+), 5 deletions(-) create mode 100644 doc/examples/reader4.c diff --git a/ChangeLog b/ChangeLog index 6bd9b096..e314c365 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Oct 21 18:03:21 CEST 2004 Daniel Veillard + + * xmlschemas.c: fixed a memory bug + * doc/examples/reader4.c doc/examples/*: added test from Graham Bennett + and regenerated the directory + Tue Oct 19 11:06:39 CEST 2004 Daniel Veillard * include/libxml/xmlreader.h xmlreader.c: applied patch from diff --git a/doc/examples/.cvsignore b/doc/examples/.cvsignore index 8c2bc627..5109de23 100644 --- a/doc/examples/.cvsignore +++ b/doc/examples/.cvsignore @@ -15,3 +15,4 @@ parse3 parse4 io2 xpath2 +reader4 diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 26d143f7..ee6e828c 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -17,7 +17,7 @@ install-data-local: EXTRA_DIST=examples.xsl index.py test1.xml examples.xml test2.xml writer.xml test3.xml tst.xml reader1.res reader3.res tree1.res tree2.res io1.res io2.res xpath1.res xpath2.res -noinst_PROGRAMS=xpath1 parse1 parse2 tree1 tree2 testWriter reader1 reader2 reader3 io1 parse3 parse4 io2 xpath2 +noinst_PROGRAMS=xpath1 parse1 parse2 tree1 tree2 testWriter reader1 reader2 reader3 io1 parse3 parse4 io2 xpath2 reader4 xpath1_SOURCES=xpath1.c xpath1_LDFLAGS= @@ -89,6 +89,11 @@ xpath2_LDFLAGS= xpath2_DEPENDENCIES= $(DEPS) xpath2_LDADD= @RDL_LIBS@ $(LDADDS) +reader4_SOURCES=reader4.c +reader4_LDFLAGS= +reader4_DEPENDENCIES= $(DEPS) +reader4_LDADD= @RDL_LIBS@ $(LDADDS) + valgrind: $(MAKE) CHECKER='valgrind -q' tests @@ -123,5 +128,7 @@ tests: $(noinst_PROGRAMS) @(grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0) @($(CHECKER) ./xpath2 test3.xml '//discarded' discarded > xpath2.tmp ; diff xpath2.tmp xpath2.res ; rm xpath2.tmp) @(grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0) + @($(CHECKER) ./reader4 test1.xml test2.xml test3.xml > reader4.tmp ; diff reader4.tmp reader4.res ; rm reader4.tmp) + @(grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0) diff --git a/doc/examples/examples.xml b/doc/examples/examples.xml index 0d454942..96534fc0 100644 --- a/doc/examples/examples.xml +++ b/doc/examples/examples.xml @@ -364,6 +364,26 @@ + + Parse multiple XML files reusing an xmlReader + Demonstrate the use of xmlReaderForFile() and xmlReaderNewFile to parse XML files while reusing the reader object and parser context. (Note that the XMLReader functions require libxml2 version later than 2.6.) + reader4 <filename> [ filename ... ] + reader4 test1.xml test2.xml test3.xml > reader4.tmp ; diff reader4.tmp reader4.res ; rm reader4.tmp + Graham Bennett + see Copyright for the status of this software. +
xmlReader
+ + <libxml/xmlreader.h> + + + + + + + + + + @@ -474,6 +494,7 @@ + @@ -564,6 +585,10 @@ + + + + @@ -597,6 +622,7 @@ + @@ -624,11 +650,13 @@ + + @@ -714,6 +742,7 @@ +
diff --git a/doc/examples/index.html b/doc/examples/index.html index a84a9ac1..e7bf7fe3 100644 --- a/doc/examples/index.html +++ b/doc/examples/index.html @@ -8,7 +8,7 @@ H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } Libxml2 set of examples
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Libxml2 set of examples

Examples Menu
Related links

The examples are stored per section depending on the main focus - of the example:

  • xmlWriter :

  • InputOutput :

    • io1.c: Example of custom Input/Output
    • io2.c: Output to char buffer

  • Tree :

    • tree1.c: Navigates a tree to print element names
    • tree2.c: Creates a tree

  • XPath :

    • xpath1.c: Evaluate XPath expression and prints result node set.
    • xpath2.c: Load a document, locate subelements with XPath, modify said elements and save the resulting document.

  • xmlReader :

    • reader1.c: Parse an XML file with an xmlReader
    • reader2.c: Parse and validate an XML file with an xmlReader
    • reader3.c: Show how to extract subdocuments with xmlReader

  • Parsing :

    • parse1.c: Parse an XML file to a tree and free it
    • parse2.c: Parse and validate an XML file to a tree and free the result
    • parse3.c: Parse an XML document in memory to a tree and free it
    • parse4.c: Parse an XML document chunk by chunk to a tree and free it

Getting the compilation options and libraries dependancies needed + of the example:

  • xmlWriter :

  • InputOutput :

    • io1.c: Example of custom Input/Output
    • io2.c: Output to char buffer

  • Tree :

    • tree1.c: Navigates a tree to print element names
    • tree2.c: Creates a tree

  • XPath :

    • xpath1.c: Evaluate XPath expression and prints result node set.
    • xpath2.c: Load a document, locate subelements with XPath, modify said elements and save the resulting document.

  • Parsing :

    • parse1.c: Parse an XML file to a tree and free it
    • parse2.c: Parse and validate an XML file to a tree and free the result
    • parse3.c: Parse an XML document in memory to a tree and free it
    • parse4.c: Parse an XML document chunk by chunk to a tree and free it

  • xmlReader :

    • reader1.c: Parse an XML file with an xmlReader
    • reader2.c: Parse and validate an XML file with an xmlReader
    • reader3.c: Show how to extract subdocuments with xmlReader
    • reader4.c: Parse multiple XML files reusing an xmlReader

Getting the compilation options and libraries dependancies needed to generate binaries from the examples is best done on Linux/Unix by using the xml2-config script which should have been installed as part of make -install step or when installing the libxml2 development package:

gcc -o example `xml2-config --cflags` example.c `xml2-config --libs`

InputOutput Examples

io1.c: Example of custom Input/Output

Demonstrate the use of xmlRegisterInputCallbacks to build a custom I/O layer, this is used in an XInclude method context to show how dynamic document can be built in a clean way.

Includes:

Uses:

Usage:

io1

Author: Daniel Veillard

io2.c: Output to char buffer

Demonstrate the use of xmlDocDumpMemory to output document to a character buffer

Includes:

Uses:

Usage:

io2

Author: John Fleck

Parsing Examples

parse1.c: Parse an XML file to a tree and free it

Demonstrate the use of xmlReadFile() to read an XML file into a tree and and xmlFreeDoc() to free the resulting tree

Includes:

Uses:

Usage:

parse1 test1.xml

Author: Daniel Veillard

parse2.c: Parse and validate an XML file to a tree and free the result

Create a parser context for an XML file, then parse and validate the file, creating a tree, check the validation result and xmlFreeDoc() to free the resulting tree.

Includes:

Uses:

Usage:

parse2 test2.xml

Author: Daniel Veillard

parse3.c: Parse an XML document in memory to a tree and free it

Demonstrate the use of xmlReadMemory() to read an XML file into a tree and and xmlFreeDoc() to free the resulting tree

Includes:

Uses:

Usage:

parse3

Author: Daniel Veillard

parse4.c: Parse an XML document chunk by chunk to a tree and free it

Demonstrate the use of xmlCreatePushParserCtxt() and xmlParseChunk() to read an XML file progressively into a tree and and xmlFreeDoc() to free the resulting tree

Includes:

Uses:

Usage:

parse4 test3.xml

Author: Daniel Veillard

Tree Examples

tree1.c: Navigates a tree to print element names

Parse a file to a tree, use xmlDocGetRootElement() to get the root element, then walk the document and print all the element name in document order.

Includes:

Uses:

Usage:

tree1 filename_or_URL

Author: Dodji Seketeli

tree2.c: Creates a tree

Shows how to create document, nodes and dump it to stdout or file.

Includes:

Uses:

Usage:

tree2 <filename> -Default output: stdout

Author: Lucas Brasilino <brasilino@recife.pe.gov.br>

XPath Examples

xpath1.c: Evaluate XPath expression and prints result node set.

Shows how to evaluate XPath expression and register known namespaces in XPath context.

Includes:

Uses:

Usage:

xpath1 <xml-file> <xpath-expr> [<known-ns-list>]

Author: Aleksey Sanin

xpath2.c: Load a document, locate subelements with XPath, modify said elements and save the resulting document.

Shows how to make a full round-trip from a load/edit/save

Includes:

Uses:

Usage:

xpath2 <xml-file> <xpath-expr> <new-value>

Author: Aleksey Sanin and Daniel Veillard

xmlReader Examples

reader1.c: Parse an XML file with an xmlReader

Demonstrate the use of xmlReaderForFile() to parse an XML file and dump the informations about the nodes found in the process. (Note that the XMLReader functions require libxml2 version later than 2.6.)

Includes:

Uses:

Usage:

reader1 <filename>

Author: Daniel Veillard

reader2.c: Parse and validate an XML file with an xmlReader

Demonstrate the use of xmlReaderForFile() to parse an XML file validating the content in the process and activating options like entities substitution, and DTD attributes defaulting. (Note that the XMLReader functions require libxml2 version later than 2.6.)

Includes:

Uses:

Usage:

reader2 <valid_xml_filename>

Author: Daniel Veillard

reader3.c: Show how to extract subdocuments with xmlReader

Demonstrate the use of xmlTextReaderPreservePattern() to parse an XML file with the xmlReader while collecting only some subparts of the document. (Note that the XMLReader functions require libxml2 version later than 2.6.)

Includes:

Uses:

Usage:

reader3

Author: Daniel Veillard

xmlWriter Examples

testWriter.c: use various APIs for the xmlWriter

tests a number of APIs for the xmlWriter, especially the various methods to write to a filename, to a memory buffer, to a new document, or to a subtree. It shows how to do encoding string conversions too. The resulting documents are then serialized.

Includes:

Uses:

Usage:

testWriter

Author: Alfred Mickautsch

Daniel Veillard

+install step or when installing the libxml2 development package:

gcc -o example `xml2-config --cflags` example.c `xml2-config --libs`

InputOutput Examples

io1.c: Example of custom Input/Output

Demonstrate the use of xmlRegisterInputCallbacks to build a custom I/O layer, this is used in an XInclude method context to show how dynamic document can be built in a clean way.

Includes:

Uses:

Usage:

io1

Author: Daniel Veillard

io2.c: Output to char buffer

Demonstrate the use of xmlDocDumpMemory to output document to a character buffer

Includes:

Uses:

Usage:

io2

Author: John Fleck

Parsing Examples

parse1.c: Parse an XML file to a tree and free it

Demonstrate the use of xmlReadFile() to read an XML file into a tree and and xmlFreeDoc() to free the resulting tree

Includes:

Uses:

Usage:

parse1 test1.xml

Author: Daniel Veillard

parse2.c: Parse and validate an XML file to a tree and free the result

Create a parser context for an XML file, then parse and validate the file, creating a tree, check the validation result and xmlFreeDoc() to free the resulting tree.

Includes:

Uses:

Usage:

parse2 test2.xml

Author: Daniel Veillard

parse3.c: Parse an XML document in memory to a tree and free it

Demonstrate the use of xmlReadMemory() to read an XML file into a tree and and xmlFreeDoc() to free the resulting tree

Includes:

Uses:

Usage:

parse3

Author: Daniel Veillard

parse4.c: Parse an XML document chunk by chunk to a tree and free it

Demonstrate the use of xmlCreatePushParserCtxt() and xmlParseChunk() to read an XML file progressively into a tree and and xmlFreeDoc() to free the resulting tree

Includes:

Uses:

Usage:

parse4 test3.xml

Author: Daniel Veillard

Tree Examples

tree1.c: Navigates a tree to print element names

Parse a file to a tree, use xmlDocGetRootElement() to get the root element, then walk the document and print all the element name in document order.

Includes:

Uses:

Usage:

tree1 filename_or_URL

Author: Dodji Seketeli

tree2.c: Creates a tree

Shows how to create document, nodes and dump it to stdout or file.

Includes:

Uses:

Usage:

tree2 <filename> -Default output: stdout

Author: Lucas Brasilino <brasilino@recife.pe.gov.br>

XPath Examples

xpath1.c: Evaluate XPath expression and prints result node set.

Shows how to evaluate XPath expression and register known namespaces in XPath context.

Includes:

Uses:

Usage:

xpath1 <xml-file> <xpath-expr> [<known-ns-list>]

Author: Aleksey Sanin

xpath2.c: Load a document, locate subelements with XPath, modify said elements and save the resulting document.

Shows how to make a full round-trip from a load/edit/save

Includes:

Uses:

Usage:

xpath2 <xml-file> <xpath-expr> <new-value>

Author: Aleksey Sanin and Daniel Veillard

xmlReader Examples

reader1.c: Parse an XML file with an xmlReader

Demonstrate the use of xmlReaderForFile() to parse an XML file and dump the informations about the nodes found in the process. (Note that the XMLReader functions require libxml2 version later than 2.6.)

Includes:

Uses:

Usage:

reader1 <filename>

Author: Daniel Veillard

reader2.c: Parse and validate an XML file with an xmlReader

Demonstrate the use of xmlReaderForFile() to parse an XML file validating the content in the process and activating options like entities substitution, and DTD attributes defaulting. (Note that the XMLReader functions require libxml2 version later than 2.6.)

Includes:

Uses:

Usage:

reader2 <valid_xml_filename>

Author: Daniel Veillard

reader3.c: Show how to extract subdocuments with xmlReader

Demonstrate the use of xmlTextReaderPreservePattern() to parse an XML file with the xmlReader while collecting only some subparts of the document. (Note that the XMLReader functions require libxml2 version later than 2.6.)

Includes:

Uses:

Usage:

reader3

Author: Daniel Veillard

reader4.c: Parse multiple XML files reusing an xmlReader

Demonstrate the use of xmlReaderForFile() and xmlReaderNewFile to parse XML files while reusing the reader object and parser context. (Note that the XMLReader functions require libxml2 version later than 2.6.)

Includes:

Uses:

Usage:

reader4 <filename> [ filename ... ]

Author: Graham Bennett

xmlWriter Examples

testWriter.c: use various APIs for the xmlWriter

tests a number of APIs for the xmlWriter, especially the various methods to write to a filename, to a memory buffer, to a new document, or to a subtree. It shows how to do encoding string conversions too. The resulting documents are then serialized.

Includes:

Uses:

Usage:

testWriter

Author: Alfred Mickautsch

Daniel Veillard

diff --git a/doc/examples/reader4.c b/doc/examples/reader4.c new file mode 100644 index 00000000..ed2726aa --- /dev/null +++ b/doc/examples/reader4.c @@ -0,0 +1,122 @@ +/** + * section: xmlReader + * synopsis: Parse multiple XML files reusing an xmlReader + * purpose: Demonstrate the use of xmlReaderForFile() and + * xmlReaderNewFile to parse XML files while reusing the reader object + * and parser context. (Note that the XMLReader functions require + * libxml2 version later than 2.6.) + * usage: reader4 [ filename ... ] + * test: reader4 test1.xml test2.xml test3.xml > reader4.tmp ; diff reader4.tmp reader4.res ; rm reader4.tmp + * author: Graham Bennett + * copy: see Copyright for the status of this software. + */ + +#include +#include + +#ifdef LIBXML_READER_ENABLED + +static void processDoc(xmlTextReaderPtr readerPtr) { + int ret; + xmlDocPtr docPtr; + const xmlChar *URL; + + ret = xmlTextReaderRead(readerPtr); + while (ret == 1) { + ret = xmlTextReaderRead(readerPtr); + } + + /* + * One can obtain the document pointer to get insteresting + * information about the document like the URL, but one must also + * be sure to clean it up at the end (see below). + */ + docPtr = xmlTextReaderCurrentDoc(readerPtr); + if (NULL == docPtr) { + fprintf(stderr, "failed to obtain document\n"); + return; + } + + URL = docPtr->URL; + if (NULL == URL) { + fprintf(stderr, "Failed to obtain URL\n"); + } + + if (ret != 0) { + fprintf(stderr, "%s: Failed to parse\n", URL); + return; + } + + printf("%s: Processed ok\n", (const char *)URL); +} + +int main(int argc, char **argv) { + xmlTextReaderPtr readerPtr; + int i; + xmlDocPtr docPtr; + + if (argc < 2) + return(1); + + /* + * this initialises the library and check potential ABI mismatches + * between the version it was compiled for and the actual shared + * library used. + */ + LIBXML_TEST_VERSION + + /* + * Create a new reader for the first file and process the + * document. + */ + readerPtr = xmlReaderForFile(argv[1], NULL, 0); + if (NULL == readerPtr) { + fprintf(stderr, "%s: failed to create reader\n", argv[1]); + return(1); + } + processDoc(readerPtr); + + /* + * The reader can be reused for subsequent files. + */ + for (i=2; i < argc; ++i) { + xmlReaderNewFile(readerPtr, argv[i], NULL, 0); + if (NULL == readerPtr) { + fprintf(stderr, "%s: failed to create reader\n", argv[i]); + return(1); + } + processDoc(readerPtr); + } + + /* + * Since we've called xmlTextReaderCurrentDoc, we now have to + * clean up after ourselves. We only have to do this the last + * time, because xmlReaderNewFile calls xmlCtxtReset which takes + * care of it. + */ + docPtr = xmlTextReaderCurrentDoc(readerPtr); + if (docPtr != NULL) + xmlFreeDoc(docPtr); + + /* + * Clean up the reader. + */ + xmlFreeTextReader(readerPtr); + + /* + * Cleanup function for the XML library. + */ + xmlCleanupParser(); + /* + * this is to debug memory for regression tests + */ + xmlMemoryDump(); + return(0); +} + +#else +int main(void) { + fprintf(stderr, "xmlReader support not compiled in\n"); + exit(1); +} +#endif diff --git a/xmlschemas.c b/xmlschemas.c index cc9620e6..1e938d0b 100644 --- a/xmlschemas.c +++ b/xmlschemas.c @@ -7748,6 +7748,8 @@ xmlSchemaParseComplexType(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema, xmlAttrPtr attr; const xmlChar *attrValue; xmlChar *des = NULL; /* The reported designation. */ + char buf[40]; + if ((ctxt == NULL) || (schema == NULL) || (node == NULL)) return (NULL); @@ -7770,8 +7772,6 @@ xmlSchemaParseComplexType(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema, } if (topLevel == 0) { - char buf[40]; - /* * Parse as local complex type definition. */