diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2002-09-24 14:13:13 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2002-09-24 14:13:13 +0000 |
| commit | 118aed78f360f51d182770e62b251ef324707aa2 (patch) | |
| tree | 7663107b890922ac71f466bc749f1f9dd45104c0 /valid.c | |
| parent | 7233615a61a3636d8354e4e62b5c041f5fe0cbaf (diff) | |
| download | android_external_libxml2-118aed78f360f51d182770e62b251ef324707aa2.tar.gz android_external_libxml2-118aed78f360f51d182770e62b251ef324707aa2.tar.bz2 android_external_libxml2-118aed78f360f51d182770e62b251ef324707aa2.zip | |
fixed the data callback on transition functionality which was broken when
* xmlregexp.c: fixed the data callback on transition functionality
which was broken when using the compact form
* result/schemas/*: updated the results, less verbose, all tests
pass like before
* DOCBparser.c testAutomata.c testC14N.c testSchemas.c testThreads.c
testXPath.c valid.c xinclude.c xmllint.c xmlregexp.c xmlschemas.c
xmlschemastypes.c xpath.c python/libxml.c: removed a bunch of
annoying warnings
* xpath.c: try to provide better error report when possible
Daniel
Diffstat (limited to 'valid.c')
| -rw-r--r-- | valid.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -110,6 +110,7 @@ typedef struct _xmlValidState { #define SET_OCCURRENCE ctxt->vstate->occurs |= (1 << DEPTH) #define RESET_OCCURRENCE ctxt->vstate->occurs &= ((1 << DEPTH) - 1) +#ifndef LIBXML_REGEXP_ENABLED static int vstateVPush(xmlValidCtxtPtr ctxt, xmlElementContentPtr cont, xmlNodePtr node, unsigned char depth, long occurs, @@ -160,6 +161,8 @@ vstateVPop(xmlValidCtxtPtr ctxt) { return(ctxt->vstateNr); } +#endif /* LIBXML_REGEXP_ENABLED */ + PUSH_AND_POP(static, xmlNodePtr, node) #ifdef DEBUG_VALID_ALGO @@ -3814,6 +3817,7 @@ xmlValidateOneAttribute(xmlValidCtxtPtr ctxt, xmlDocPtr doc, return(ret); } +#ifndef LIBXML_REGEXP_ENABLED /** * xmlValidateSkipIgnorable: * @ctxt: the validation context @@ -3849,7 +3853,6 @@ xmlValidateSkipIgnorable(xmlNodePtr child) { return(child); } -#ifndef LIBXML_REGEXP_ENABLED /** * xmlValidateElementType: * @ctxt: the validation context |