From 9186a1fdb637c71a7fbeb76e0bbe6104ee345de3 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Sat, 15 Jan 2005 12:38:10 +0000 Subject: [PATCH] fixed bug #157633 in relaxng choice optimization added regression tests * relaxng.c: fixed bug #157633 in relaxng choice optimization * result/relaxng/choice0* test/relaxng/choice0*: added regression tests about it. * doc/*: rebuilt * testdso.c: removed a warning due to a missing void in signature. Daniel --- ChangeLog | 8 ++ doc/APIchunk0.html | 2 +- doc/APIchunk1.html | 2 +- doc/APIchunk10.html | 2 +- doc/APIchunk11.html | 2 +- doc/APIchunk12.html | 2 +- doc/APIchunk13.html | 2 +- doc/APIchunk14.html | 2 +- doc/APIchunk15.html | 2 +- doc/APIchunk16.html | 2 +- doc/APIchunk17.html | 2 +- doc/APIchunk18.html | 2 +- doc/APIchunk19.html | 2 +- doc/APIchunk2.html | 2 +- doc/APIchunk20.html | 2 +- doc/APIchunk21.html | 2 +- doc/APIchunk22.html | 2 +- doc/APIchunk23.html | 2 +- doc/APIchunk24.html | 2 +- doc/APIchunk25.html | 2 +- doc/APIchunk26.html | 2 +- doc/APIchunk3.html | 2 +- doc/APIchunk4.html | 2 +- doc/APIchunk5.html | 2 +- doc/APIchunk6.html | 2 +- doc/APIchunk7.html | 2 +- doc/APIchunk8.html | 2 +- doc/APIchunk9.html | 2 +- doc/APIconstructors.html | 2 +- doc/APIfiles.html | 2 +- doc/APIfunctions.html | 2 +- doc/APIsymbols.html | 2 +- doc/examples/.cvsignore | 2 +- doc/examples/Makefile.am | 16 ++-- doc/examples/examples.xml | 144 +++++++++++++++++------------------ relaxng.c | 13 ++-- result/relaxng/choice0_0 | 0 result/relaxng/choice0_0.err | 1 + result/relaxng/choice0_1 | 0 result/relaxng/choice0_1.err | 1 + result/relaxng/choice0_2 | 0 result/relaxng/choice0_2.err | 1 + result/relaxng/choice0_3 | 0 result/relaxng/choice0_3.err | 1 + result/relaxng/choice0_4 | 0 result/relaxng/choice0_4.err | 2 + result/relaxng/choice0_5 | 0 result/relaxng/choice0_5.err | 2 + result/relaxng/choice0_6 | 0 result/relaxng/choice0_6.err | 2 + result/relaxng/choice0_7 | 0 result/relaxng/choice0_7.err | 3 + result/relaxng/choice0_8 | 0 result/relaxng/choice0_8.err | 3 + result/relaxng/choice0_err | 1 + result/relaxng/choice0_valid | 0 test/relaxng/choice0.rng | 25 ++++++ test/relaxng/choice0_0.xml | 2 + test/relaxng/choice0_1.xml | 2 + test/relaxng/choice0_2.xml | 3 + test/relaxng/choice0_3.xml | 3 + test/relaxng/choice0_4.xml | 2 + test/relaxng/choice0_5.xml | 3 + test/relaxng/choice0_6.xml | 3 + test/relaxng/choice0_7.xml | 3 + test/relaxng/choice0_8.xml | 3 + testdso.c | 2 +- 67 files changed, 194 insertions(+), 119 deletions(-) create mode 100644 result/relaxng/choice0_0 create mode 100644 result/relaxng/choice0_0.err create mode 100644 result/relaxng/choice0_1 create mode 100644 result/relaxng/choice0_1.err create mode 100644 result/relaxng/choice0_2 create mode 100644 result/relaxng/choice0_2.err create mode 100644 result/relaxng/choice0_3 create mode 100644 result/relaxng/choice0_3.err create mode 100644 result/relaxng/choice0_4 create mode 100644 result/relaxng/choice0_4.err create mode 100644 result/relaxng/choice0_5 create mode 100644 result/relaxng/choice0_5.err create mode 100644 result/relaxng/choice0_6 create mode 100644 result/relaxng/choice0_6.err create mode 100644 result/relaxng/choice0_7 create mode 100644 result/relaxng/choice0_7.err create mode 100644 result/relaxng/choice0_8 create mode 100644 result/relaxng/choice0_8.err create mode 100644 result/relaxng/choice0_err create mode 100644 result/relaxng/choice0_valid create mode 100644 test/relaxng/choice0.rng create mode 100644 test/relaxng/choice0_0.xml create mode 100644 test/relaxng/choice0_1.xml create mode 100644 test/relaxng/choice0_2.xml create mode 100644 test/relaxng/choice0_3.xml create mode 100644 test/relaxng/choice0_4.xml create mode 100644 test/relaxng/choice0_5.xml create mode 100644 test/relaxng/choice0_6.xml create mode 100644 test/relaxng/choice0_7.xml create mode 100644 test/relaxng/choice0_8.xml diff --git a/ChangeLog b/ChangeLog index 66810173..84024839 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sat Jan 15 13:35:19 CET 2005 Daniel Veillard + + * relaxng.c: fixed bug #157633 in relaxng choice optimization + * result/relaxng/choice0* test/relaxng/choice0*: added regression + tests about it. + * doc/*: rebuilt + * testdso.c: removed a warning due to a missing void in signature. + Thu Jan 13 17:42:55 CET 2005 Kasimier Buchcik * include/libxml/schemasInternals.h xmlschemas.c: diff --git a/doc/APIchunk0.html b/doc/APIchunk0.html index d0732d8c..c0d3fe32 100644 --- a/doc/APIchunk0.html +++ b/doc/APIchunk0.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index A-B for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index A-B for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index A-B for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index A-B for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk1.html b/doc/APIchunk1.html index 06ce2c50..28b00380 100644 --- a/doc/APIchunk1.html +++ b/doc/APIchunk1.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index C-C for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index C-C for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index C-C for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index C-C for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html index 51778982..4b7b59d1 100644 --- a/doc/APIchunk10.html +++ b/doc/APIchunk10.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index c-c for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index c-c for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index c-c for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index c-c for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk11.html b/doc/APIchunk11.html index 114aba1f..f48ee2ad 100644 --- a/doc/APIchunk11.html +++ b/doc/APIchunk11.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index d-d for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index d-d for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index d-d for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index d-d for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk12.html b/doc/APIchunk12.html index f7d90f58..fd7812da 100644 --- a/doc/APIchunk12.html +++ b/doc/APIchunk12.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index e-e for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index e-e for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index e-e for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index e-e for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html index 559c12ef..81e2cd81 100644 --- a/doc/APIchunk13.html +++ b/doc/APIchunk13.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index f-f for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index f-f for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index f-f for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index f-f for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk14.html b/doc/APIchunk14.html index dc631b46..a1001177 100644 --- a/doc/APIchunk14.html +++ b/doc/APIchunk14.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index g-h for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index g-h for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index g-h for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index g-h for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk15.html b/doc/APIchunk15.html index 3888a873..afdadd16 100644 --- a/doc/APIchunk15.html +++ b/doc/APIchunk15.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index i-i for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index i-i for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index i-i for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index i-i for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk16.html b/doc/APIchunk16.html index 5308dbb5..53bb9181 100644 --- a/doc/APIchunk16.html +++ b/doc/APIchunk16.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index j-l for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index j-l for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index j-l for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index j-l for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk17.html b/doc/APIchunk17.html index c91a075c..7f05a0cb 100644 --- a/doc/APIchunk17.html +++ b/doc/APIchunk17.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index m-m for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index m-m for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index m-m for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index m-m for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk18.html b/doc/APIchunk18.html index b38aeb5e..44a51019 100644 --- a/doc/APIchunk18.html +++ b/doc/APIchunk18.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index n-n for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index n-n for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index n-n for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index n-n for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk19.html b/doc/APIchunk19.html index 9c15d8fd..1c0d2475 100644 --- a/doc/APIchunk19.html +++ b/doc/APIchunk19.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index o-o for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index o-o for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index o-o for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index o-o for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk2.html b/doc/APIchunk2.html index 625c6f25..7c690173 100644 --- a/doc/APIchunk2.html +++ b/doc/APIchunk2.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index D-E for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index D-E for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index D-E for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index D-E for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk20.html b/doc/APIchunk20.html index c63cfc1b..d690d5ac 100644 --- a/doc/APIchunk20.html +++ b/doc/APIchunk20.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index p-p for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index p-p for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index p-p for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index p-p for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk21.html b/doc/APIchunk21.html index 72ab43f2..7b403a07 100644 --- a/doc/APIchunk21.html +++ b/doc/APIchunk21.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index q-r for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index q-r for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index q-r for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index q-r for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk22.html b/doc/APIchunk22.html index 2a0e5bf2..267fd233 100644 --- a/doc/APIchunk22.html +++ b/doc/APIchunk22.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index s-s for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index s-s for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index s-s for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index s-s for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk23.html b/doc/APIchunk23.html index bbfb4696..6afc6761 100644 --- a/doc/APIchunk23.html +++ b/doc/APIchunk23.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index t-t for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index t-t for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index t-t for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index t-t for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk24.html b/doc/APIchunk24.html index 25f44f23..8e3a79d5 100644 --- a/doc/APIchunk24.html +++ b/doc/APIchunk24.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index u-v for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index u-v for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index u-v for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index u-v for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk25.html b/doc/APIchunk25.html index 3dc8bfd3..a9fbc939 100644 --- a/doc/APIchunk25.html +++ b/doc/APIchunk25.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index w-w for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index w-w for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index w-w for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index w-w for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk26.html b/doc/APIchunk26.html index eb0df980..f3d9bc17 100644 --- a/doc/APIchunk26.html +++ b/doc/APIchunk26.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index x-x for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index x-x for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index x-x for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index x-x for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk3.html b/doc/APIchunk3.html index 3534a942..a2146cc0 100644 --- a/doc/APIchunk3.html +++ b/doc/APIchunk3.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index F-I for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index F-I for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index F-I for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index F-I for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk4.html b/doc/APIchunk4.html index 16f80a84..0ddc0106 100644 --- a/doc/APIchunk4.html +++ b/doc/APIchunk4.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index J-N for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index J-N for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index J-N for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index J-N for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk5.html b/doc/APIchunk5.html index 7efc212a..5f418f1a 100644 --- a/doc/APIchunk5.html +++ b/doc/APIchunk5.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index O-P for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index O-P for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index O-P for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index O-P for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk6.html b/doc/APIchunk6.html index da3aa541..6dc25db9 100644 --- a/doc/APIchunk6.html +++ b/doc/APIchunk6.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index Q-S for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index Q-S for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index Q-S for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index Q-S for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk7.html b/doc/APIchunk7.html index 423610aa..f4015380 100644 --- a/doc/APIchunk7.html +++ b/doc/APIchunk7.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index T-U for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index T-U for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index T-U for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index T-U for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk8.html b/doc/APIchunk8.html index 28fa8c02..76e4e7af 100644 --- a/doc/APIchunk8.html +++ b/doc/APIchunk8.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index V-a for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index V-a for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index V-a for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index V-a for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIchunk9.html b/doc/APIchunk9.html index c86c820c..e5b70331 100644 --- a/doc/APIchunk9.html +++ b/doc/APIchunk9.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -API Alphabetic Index b-b for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index b-b for libxml2

Developer Menu
API Indexes
Related links

A-B +API Alphabetic Index b-b for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

API Alphabetic Index b-b for libxml2

Developer Menu
API Indexes
Related links

A-B C-C D-E F-I diff --git a/doc/APIconstructors.html b/doc/APIconstructors.html index 71f40d2b..a1856c8f 100644 --- a/doc/APIconstructors.html +++ b/doc/APIconstructors.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -List of constructors for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

List of constructors for libxml2

Developer Menu
API Indexes
Related links

Type const htmlElemDesc *:

htmlTagLookup
+List of constructors for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

List of constructors for libxml2

Developer Menu
API Indexes
Related links

Type const htmlElemDesc *:

htmlTagLookup

Type const htmlEntityDesc *:

htmlEntityLookup
htmlEntityValueLookup
htmlParseEntityRef
diff --git a/doc/APIfiles.html b/doc/APIfiles.html index 77b187b9..06f4342f 100644 --- a/doc/APIfiles.html +++ b/doc/APIfiles.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -List of Symbols per Module for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

List of Symbols per Module for libxml2

Developer Menu
API Indexes
Related links

Module DOCBparser:

docbCreateFileParserCtxt
+List of Symbols per Module for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

List of Symbols per Module for libxml2

Developer Menu
API Indexes
Related links

Module DOCBparser:

docbCreateFileParserCtxt
docbCreatePushParserCtxt
docbDocPtr
docbEncodeEntities
diff --git a/doc/APIfunctions.html b/doc/APIfunctions.html index 03b44b9b..c8012a93 100644 --- a/doc/APIfunctions.html +++ b/doc/APIfunctions.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -List of function manipulating types in libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

List of function manipulating types in libxml2

Developer Menu
API Indexes
Related links

Type ...:

errorSAXFunc
+List of function manipulating types in libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

List of function manipulating types in libxml2

Developer Menu
API Indexes
Related links

Type ...:

errorSAXFunc
fatalErrorSAXFunc
warningSAXFunc
xmlGenericErrorFunc
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html index 341c84cf..66f0640f 100644 --- a/doc/APIsymbols.html +++ b/doc/APIsymbols.html @@ -7,7 +7,7 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -Alphabetic List of Symbols in libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

Alphabetic List of Symbols in libxml2

Developer Menu
API Indexes
Related links

Letter A:

ATTRIBUTE_UNUSED
+Alphabetic List of Symbols in libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

Alphabetic List of Symbols in libxml2

Developer Menu
API Indexes
Related links

Letter A:

ATTRIBUTE_UNUSED

Letter B:

BAD_CAST
BASE_BUFFER_SIZE

Letter C:

CAST_TO_BOOLEAN
diff --git a/doc/examples/.cvsignore b/doc/examples/.cvsignore index 5109de23..e66329e6 100644 --- a/doc/examples/.cvsignore +++ b/doc/examples/.cvsignore @@ -9,10 +9,10 @@ tree2 testWriter reader1 reader2 -reader3 io1 parse3 parse4 io2 xpath2 reader4 +reader3 diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 96679160..a3ef18fa 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 reader4.res -noinst_PROGRAMS=xpath1 parse1 parse2 tree1 tree2 testWriter reader1 reader2 reader3 io1 parse3 parse4 io2 xpath2 reader4 +noinst_PROGRAMS=xpath1 parse1 parse2 tree1 tree2 testWriter reader1 reader2 io1 parse3 parse4 io2 xpath2 reader4 reader3 xpath1_SOURCES=xpath1.c xpath1_LDFLAGS= @@ -59,11 +59,6 @@ reader2_LDFLAGS= reader2_DEPENDENCIES= $(DEPS) reader2_LDADD= @RDL_LIBS@ $(LDADDS) -reader3_SOURCES=reader3.c -reader3_LDFLAGS= -reader3_DEPENDENCIES= $(DEPS) -reader3_LDADD= @RDL_LIBS@ $(LDADDS) - io1_SOURCES=io1.c io1_LDFLAGS= io1_DEPENDENCIES= $(DEPS) @@ -94,6 +89,11 @@ reader4_LDFLAGS= reader4_DEPENDENCIES= $(DEPS) reader4_LDADD= @RDL_LIBS@ $(LDADDS) +reader3_SOURCES=reader3.c +reader3_LDFLAGS= +reader3_DEPENDENCIES= $(DEPS) +reader3_LDADD= @RDL_LIBS@ $(LDADDS) + valgrind: $(MAKE) CHECKER='valgrind -q' tests @@ -116,8 +116,6 @@ tests: $(noinst_PROGRAMS) @(grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0) @($(CHECKER) ./reader2 test2.xml > reader1.tmp ; diff reader1.tmp reader1.res ; rm reader1.tmp) @(grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0) - @($(CHECKER) ./reader3 > reader3.tmp ; diff reader3.tmp reader3.res ; rm reader3.tmp) - @(grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0) @($(CHECKER) ./io1 > io1.tmp ; diff io1.tmp io1.res ; rm -f io1.tmp) @(grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0) @($(CHECKER) ./parse3) @@ -130,5 +128,7 @@ tests: $(noinst_PROGRAMS) @(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) + @($(CHECKER) ./reader3 > reader3.tmp ; diff reader3.tmp reader3.res ; rm reader3.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 bded118f..7a683cdf 100644 --- a/doc/examples/examples.xml +++ b/doc/examples/examples.xml @@ -8,8 +8,8 @@ see Copyright for the status of this software.

XPath
- <libxml/xpath.h> <libxml/parser.h> + <libxml/xpath.h> <libxml/xpathInternals.h> <libxml/tree.h> @@ -18,12 +18,12 @@ + - + - @@ -32,8 +32,8 @@ - - + + @@ -50,12 +50,12 @@ <libxml/parser.h> + - @@ -72,12 +72,12 @@ - - + + @@ -96,12 +96,12 @@ <libxml/parser.h> + + - - @@ -145,39 +145,39 @@ <libxml/xmlwriter.h> - - - + - - - - - - - - + + + + + + + + + + + + + + + + - - + - - - - - @@ -236,28 +236,6 @@ - - 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.) - reader3 - reader3 > reader3.tmp ; diff reader3.tmp reader3.res ; rm reader3.tmp - Daniel Veillard - see Copyright for the status of this software. -
xmlReader
- - <libxml/xmlreader.h> - - - - - - - - - - - - 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. @@ -268,9 +246,9 @@
InputOutput
<libxml/parser.h> + <libxml/xmlIO.h> <libxml/xinclude.h> <libxml/tree.h> - <libxml/xmlIO.h> @@ -294,6 +272,7 @@ + @@ -345,23 +324,23 @@ see Copyright for the status of this software.
XPath
- <libxml/xpath.h> <libxml/parser.h> + <libxml/xpath.h> <libxml/xpathInternals.h> <libxml/tree.h> - - - - - - - - - - - + + + + + + + + + + + @@ -376,14 +355,35 @@ <libxml/xmlreader.h> - + + + 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.) + reader3 + reader3 > reader3.tmp ; diff reader3.tmp reader3.res ; rm reader3.tmp + Daniel Veillard + see Copyright for the status of this software. +
xmlReader
+ + <libxml/xmlreader.h> + + + + + + + + + + + @@ -447,9 +447,9 @@ - + @@ -462,8 +462,8 @@ - + @@ -493,8 +493,8 @@ - + @@ -584,8 +584,8 @@ - + @@ -621,8 +621,8 @@ - + @@ -649,14 +649,14 @@ - + - + @@ -741,8 +741,8 @@
- +
diff --git a/relaxng.c b/relaxng.c index af4de868..16174e07 100644 --- a/relaxng.c +++ b/relaxng.c @@ -10047,8 +10047,13 @@ xmlRelaxNGValidateState(xmlRelaxNGValidCtxtPtr ctxt, node = xmlRelaxNGSkipIgnored(ctxt, node); errNr = ctxt->errNr; - if ((define->dflags & IS_TRIABLE) - && (define->data != NULL)) { + if ((define->dflags & IS_TRIABLE) && (define->data != NULL) && + (node != NULL)) { + /* + * node == NULL can't be optimized since IS_TRIABLE + * doesn't account for choice which may lead to + * only attributes. + */ xmlHashTablePtr triage = (xmlHashTablePtr) define->data; @@ -10056,10 +10061,6 @@ xmlRelaxNGValidateState(xmlRelaxNGValidCtxtPtr ctxt, * Something we can optimize cleanly there is only one * possble branch out ! */ - if (node == NULL) { - ret = -1; - break; - } if ((node->type == XML_TEXT_NODE) || (node->type == XML_CDATA_SECTION_NODE)) { list = diff --git a/result/relaxng/choice0_0 b/result/relaxng/choice0_0 new file mode 100644 index 00000000..e69de29b diff --git a/result/relaxng/choice0_0.err b/result/relaxng/choice0_0.err new file mode 100644 index 00000000..5198fa76 --- /dev/null +++ b/result/relaxng/choice0_0.err @@ -0,0 +1 @@ +./test/relaxng/choice0_0.xml validates diff --git a/result/relaxng/choice0_1 b/result/relaxng/choice0_1 new file mode 100644 index 00000000..e69de29b diff --git a/result/relaxng/choice0_1.err b/result/relaxng/choice0_1.err new file mode 100644 index 00000000..51214baf --- /dev/null +++ b/result/relaxng/choice0_1.err @@ -0,0 +1 @@ +./test/relaxng/choice0_1.xml validates diff --git a/result/relaxng/choice0_2 b/result/relaxng/choice0_2 new file mode 100644 index 00000000..e69de29b diff --git a/result/relaxng/choice0_2.err b/result/relaxng/choice0_2.err new file mode 100644 index 00000000..19bd3cc3 --- /dev/null +++ b/result/relaxng/choice0_2.err @@ -0,0 +1 @@ +./test/relaxng/choice0_2.xml validates diff --git a/result/relaxng/choice0_3 b/result/relaxng/choice0_3 new file mode 100644 index 00000000..e69de29b diff --git a/result/relaxng/choice0_3.err b/result/relaxng/choice0_3.err new file mode 100644 index 00000000..c82345f2 --- /dev/null +++ b/result/relaxng/choice0_3.err @@ -0,0 +1 @@ +./test/relaxng/choice0_3.xml validates diff --git a/result/relaxng/choice0_4 b/result/relaxng/choice0_4 new file mode 100644 index 00000000..e69de29b diff --git a/result/relaxng/choice0_4.err b/result/relaxng/choice0_4.err new file mode 100644 index 00000000..dca145bd --- /dev/null +++ b/result/relaxng/choice0_4.err @@ -0,0 +1,2 @@ +./test/relaxng/choice0_4.xml:1: element device: Relax-NG validity error : Element device failed to validate content +./test/relaxng/choice0_4.xml fails to validate diff --git a/result/relaxng/choice0_5 b/result/relaxng/choice0_5 new file mode 100644 index 00000000..e69de29b diff --git a/result/relaxng/choice0_5.err b/result/relaxng/choice0_5.err new file mode 100644 index 00000000..a8dd1c9f --- /dev/null +++ b/result/relaxng/choice0_5.err @@ -0,0 +1,2 @@ +./test/relaxng/choice0_5.xml:1: element device: Relax-NG validity error : Element device failed to validate content +./test/relaxng/choice0_5.xml fails to validate diff --git a/result/relaxng/choice0_6 b/result/relaxng/choice0_6 new file mode 100644 index 00000000..e69de29b diff --git a/result/relaxng/choice0_6.err b/result/relaxng/choice0_6.err new file mode 100644 index 00000000..4facb038 --- /dev/null +++ b/result/relaxng/choice0_6.err @@ -0,0 +1,2 @@ +./test/relaxng/choice0_6.xml:1: element device: Relax-NG validity error : Element device failed to validate content +./test/relaxng/choice0_6.xml fails to validate diff --git a/result/relaxng/choice0_7 b/result/relaxng/choice0_7 new file mode 100644 index 00000000..e69de29b diff --git a/result/relaxng/choice0_7.err b/result/relaxng/choice0_7.err new file mode 100644 index 00000000..89b9e323 --- /dev/null +++ b/result/relaxng/choice0_7.err @@ -0,0 +1,3 @@ +./test/relaxng/choice0_7.xml:1: element device: Relax-NG validity error : Did not expect element unknown-element there +./test/relaxng/choice0_7.xml:1: element device: Relax-NG validity error : Element device failed to validate content +./test/relaxng/choice0_7.xml fails to validate diff --git a/result/relaxng/choice0_8 b/result/relaxng/choice0_8 new file mode 100644 index 00000000..e69de29b diff --git a/result/relaxng/choice0_8.err b/result/relaxng/choice0_8.err new file mode 100644 index 00000000..7094ecc9 --- /dev/null +++ b/result/relaxng/choice0_8.err @@ -0,0 +1,3 @@ +./test/relaxng/choice0_8.xml:1: element device: Relax-NG validity error : Did not expect element unknown-element there +./test/relaxng/choice0_8.xml:1: element device: Relax-NG validity error : Element device failed to validate content +./test/relaxng/choice0_8.xml fails to validate diff --git a/result/relaxng/choice0_err b/result/relaxng/choice0_err new file mode 100644 index 00000000..cf124310 --- /dev/null +++ b/result/relaxng/choice0_err @@ -0,0 +1 @@ +./test/relaxng/choice0.rng validates diff --git a/result/relaxng/choice0_valid b/result/relaxng/choice0_valid new file mode 100644 index 00000000..e69de29b diff --git a/test/relaxng/choice0.rng b/test/relaxng/choice0.rng new file mode 100644 index 00000000..99526e18 --- /dev/null +++ b/test/relaxng/choice0.rng @@ -0,0 +1,25 @@ + + + + + + ethernet + + + + + + + + + + serial + + + + + + + + + diff --git a/test/relaxng/choice0_0.xml b/test/relaxng/choice0_0.xml new file mode 100644 index 00000000..113ffa8c --- /dev/null +++ b/test/relaxng/choice0_0.xml @@ -0,0 +1,2 @@ + + diff --git a/test/relaxng/choice0_1.xml b/test/relaxng/choice0_1.xml new file mode 100644 index 00000000..f0c441da --- /dev/null +++ b/test/relaxng/choice0_1.xml @@ -0,0 +1,2 @@ + + diff --git a/test/relaxng/choice0_2.xml b/test/relaxng/choice0_2.xml new file mode 100644 index 00000000..5f67e0be --- /dev/null +++ b/test/relaxng/choice0_2.xml @@ -0,0 +1,3 @@ + + + diff --git a/test/relaxng/choice0_3.xml b/test/relaxng/choice0_3.xml new file mode 100644 index 00000000..79ac4a60 --- /dev/null +++ b/test/relaxng/choice0_3.xml @@ -0,0 +1,3 @@ + + + diff --git a/test/relaxng/choice0_4.xml b/test/relaxng/choice0_4.xml new file mode 100644 index 00000000..1de1abcd --- /dev/null +++ b/test/relaxng/choice0_4.xml @@ -0,0 +1,2 @@ + + diff --git a/test/relaxng/choice0_5.xml b/test/relaxng/choice0_5.xml new file mode 100644 index 00000000..2ac50f71 --- /dev/null +++ b/test/relaxng/choice0_5.xml @@ -0,0 +1,3 @@ + + + diff --git a/test/relaxng/choice0_6.xml b/test/relaxng/choice0_6.xml new file mode 100644 index 00000000..1e4d1d2b --- /dev/null +++ b/test/relaxng/choice0_6.xml @@ -0,0 +1,3 @@ + + + diff --git a/test/relaxng/choice0_7.xml b/test/relaxng/choice0_7.xml new file mode 100644 index 00000000..f28f89f8 --- /dev/null +++ b/test/relaxng/choice0_7.xml @@ -0,0 +1,3 @@ + + + diff --git a/test/relaxng/choice0_8.xml b/test/relaxng/choice0_8.xml new file mode 100644 index 00000000..f8102298 --- /dev/null +++ b/test/relaxng/choice0_8.xml @@ -0,0 +1,3 @@ + + + diff --git a/testdso.c b/testdso.c index 6c4652f6..8bdff7e0 100644 --- a/testdso.c +++ b/testdso.c @@ -3,7 +3,7 @@ #define IN_LIBXML #include "libxml/xmlexports.h" -XMLPUBFUN int hello_world() +XMLPUBFUN int hello_world(void) { printf("Success!\n"); return 0;