diff options
author | Daniel Veillard <veillard@src.gnome.org> | 2005-08-23 22:14:02 +0000 |
---|---|---|
committer | Daniel Veillard <veillard@src.gnome.org> | 2005-08-23 22:14:02 +0000 |
commit | bca3ad25f93b7895c4c89ea38551a2873cbbd3e1 (patch) | |
tree | 2111d818aa14001b9c78f4ae5e83f05b2e5ecc2d | |
parent | 96688263686b80250571a17f830e47cd5aee9712 (diff) | |
download | android_external_libxml2-bca3ad25f93b7895c4c89ea38551a2873cbbd3e1.tar.gz android_external_libxml2-bca3ad25f93b7895c4c89ea38551a2873cbbd3e1.tar.bz2 android_external_libxml2-bca3ad25f93b7895c4c89ea38551a2873cbbd3e1.zip |
fixed compilation when configured --without-sax1 and other cleanups fixes
* SAX2.c globals.c runtest.c testC14N.c testapi.c tree.c
include/libxml/SAX2.h include/libxml/xmlregexp.h: fixed compilation
when configured --without-sax1 and other cleanups fixes bug #172683
* doc/* elfgcchack.h: regenerated
Daniel
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | SAX2.c | 2 | ||||
-rw-r--r-- | doc/APIfiles.html | 1 | ||||
-rw-r--r-- | doc/APIsymbols.html | 1 | ||||
-rw-r--r-- | doc/html/libxml-HTMLparser.html | 1 | ||||
-rw-r--r-- | doc/libxml2-api.xml | 6 | ||||
-rw-r--r-- | doc/libxml2-refs.xml | 3 | ||||
-rw-r--r-- | elfgcchack.h | 4 | ||||
-rw-r--r-- | globals.c | 2 | ||||
-rw-r--r-- | include/libxml/SAX2.h | 2 | ||||
-rw-r--r-- | include/libxml/xmlregexp.h | 4 | ||||
-rw-r--r-- | runtest.c | 8 | ||||
-rw-r--r-- | testC14N.c | 4 | ||||
-rw-r--r-- | testapi.c | 4 | ||||
-rw-r--r-- | tree.c | 2 |
15 files changed, 34 insertions, 17 deletions
@@ -1,3 +1,10 @@ +Wed Aug 24 00:11:16 CEST 2005 Daniel Veillard <daniel@veillard.com> + + * SAX2.c globals.c runtest.c testC14N.c testapi.c tree.c + include/libxml/SAX2.h include/libxml/xmlregexp.h: fixed compilation + when configured --without-sax1 and other cleanups fixes bug #172683 + * doc/* elfgcchack.h: regenerated + Tue Aug 23 20:05:05 CEST 2005 Daniel Veillard <daniel@veillard.com> * parser.c: fixed bug #170489 reported by Jirka Kosek @@ -1022,7 +1022,7 @@ xmlSAX2EndDocument(void *ctx) } } -#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) +#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) /** * xmlSAX2AttributeInternal: * @ctx: the user data (XML parser context) diff --git a/doc/APIfiles.html b/doc/APIfiles.html index 0c5df7d8..ddf17443 100644 --- a/doc/APIfiles.html +++ b/doc/APIfiles.html @@ -32,6 +32,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-HTMLparser.html#HTML_PARSE_NONET">HTML_PARSE_NONET</a><br /> <a href="html/libxml-HTMLparser.html#HTML_PARSE_NOWARNING">HTML_PARSE_NOWARNING</a><br /> <a href="html/libxml-HTMLparser.html#HTML_PARSE_PEDANTIC">HTML_PARSE_PEDANTIC</a><br /> +<a href="html/libxml-HTMLparser.html#HTML_PARSE_RECOVER">HTML_PARSE_RECOVER</a><br /> <a href="html/libxml-HTMLparser.html#HTML_REQUIRED">HTML_REQUIRED</a><br /> <a href="html/libxml-HTMLparser.html#HTML_VALID">HTML_VALID</a><br /> <a href="html/libxml-HTMLparser.html#UTF8ToHtml">UTF8ToHtml</a><br /> diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html index 57a3c7f0..20915917 100644 --- a/doc/APIsymbols.html +++ b/doc/APIsymbols.html @@ -30,6 +30,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-HTMLparser.html#HTML_PARSE_NONET">HTML_PARSE_NONET</a><br /> <a href="html/libxml-HTMLparser.html#HTML_PARSE_NOWARNING">HTML_PARSE_NOWARNING</a><br /> <a href="html/libxml-HTMLparser.html#HTML_PARSE_PEDANTIC">HTML_PARSE_PEDANTIC</a><br /> +<a href="html/libxml-HTMLparser.html#HTML_PARSE_RECOVER">HTML_PARSE_RECOVER</a><br /> <a href="html/libxml-HTMLtree.html#HTML_PI_NODE">HTML_PI_NODE</a><br /> <a href="html/libxml-HTMLtree.html#HTML_PRESERVE_NODE">HTML_PRESERVE_NODE</a><br /> <a href="html/libxml-HTMLparser.html#HTML_REQUIRED">HTML_REQUIRED</a><br /> diff --git a/doc/html/libxml-HTMLparser.html b/doc/html/libxml-HTMLparser.html index bc3ea488..161540aa 100644 --- a/doc/html/libxml-HTMLparser.html +++ b/doc/html/libxml-HTMLparser.html @@ -86,6 +86,7 @@ A:link, A:visited, A:active { text-decoration: underline } const char * name : The entity name const char * desc : the description }</pre><h3>Enum <a name="htmlParserOption" id="htmlParserOption">htmlParserOption</a></h3><pre class="programlisting">Enum htmlParserOption { + <a name="HTML_PARSE_RECOVER" id="HTML_PARSE_RECOVER">HTML_PARSE_RECOVER</a> = 1 : Relaxed parsing <a name="HTML_PARSE_NOERROR" id="HTML_PARSE_NOERROR">HTML_PARSE_NOERROR</a> = 32 : suppress error reports <a name="HTML_PARSE_NOWARNING" id="HTML_PARSE_NOWARNING">HTML_PARSE_NOWARNING</a> = 64 : suppress warning reports <a name="HTML_PARSE_PEDANTIC" id="HTML_PARSE_PEDANTIC">HTML_PARSE_PEDANTIC</a> = 128 : pedantic error reporting diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index f28ca718..27947b9e 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -40,6 +40,7 @@ <exports symbol='HTML_PARSE_NOERROR' type='enum'/> <exports symbol='HTML_DEPRECATED' type='enum'/> <exports symbol='HTML_PARSE_PEDANTIC' type='enum'/> + <exports symbol='HTML_PARSE_RECOVER' type='enum'/> <exports symbol='HTML_PARSE_NOWARNING' type='enum'/> <exports symbol='htmlParserNodeInfo' type='typedef'/> <exports symbol='htmlParserInput' type='typedef'/> @@ -4440,6 +4441,7 @@ <enum name='HTML_PARSE_NONET' file='HTMLparser' value='2048' type='htmlParserOption' info=' Forbid network access'/> <enum name='HTML_PARSE_NOWARNING' file='HTMLparser' value='64' type='htmlParserOption' info='suppress warning reports'/> <enum name='HTML_PARSE_PEDANTIC' file='HTMLparser' value='128' type='htmlParserOption' info='pedantic error reporting'/> + <enum name='HTML_PARSE_RECOVER' file='HTMLparser' value='1' type='htmlParserOption' info='Relaxed parsing'/> <enum name='HTML_REQUIRED' file='HTMLparser' value='12' type='htmlStatus' info=' VALID bit set so ( & HTML_VALID ) is TRUE'/> <enum name='HTML_VALID' file='HTMLparser' value='4' type='htmlStatus'/> <enum name='XLINK_ACTUATE_AUTO' file='xlink' value='1' type='xlinkActuate'/> @@ -12651,7 +12653,7 @@ actually an xmlCharEncoding'/> <arg name='ctx' type='void *' info='the user data (XML parser context)'/> </function> <function name='xmlSAX2EndElement' file='SAX2' module='SAX2'> - <cond>defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED)</cond> + <cond>defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED)</cond> <info>called when the end of an element has been detected.</info> <return type='void'/> <arg name='ctx' type='void *' info='the user data (XML parser context)'/> @@ -12803,7 +12805,7 @@ actually an xmlCharEncoding'/> <arg name='ctx' type='void *' info='the user data (XML parser context)'/> </function> <function name='xmlSAX2StartElement' file='SAX2' module='SAX2'> - <cond>defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED)</cond> + <cond>defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED)</cond> <info>called when an opening tag has been processed.</info> <return type='void'/> <arg name='ctx' type='void *' info='the user data (XML parser context)'/> diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml index 4628f7b9..1d9a86f4 100644 --- a/doc/libxml2-refs.xml +++ b/doc/libxml2-refs.xml @@ -24,6 +24,7 @@ <reference name='HTML_PARSE_NONET' href='html/libxml-HTMLparser.html#HTML_PARSE_NONET'/> <reference name='HTML_PARSE_NOWARNING' href='html/libxml-HTMLparser.html#HTML_PARSE_NOWARNING'/> <reference name='HTML_PARSE_PEDANTIC' href='html/libxml-HTMLparser.html#HTML_PARSE_PEDANTIC'/> + <reference name='HTML_PARSE_RECOVER' href='html/libxml-HTMLparser.html#HTML_PARSE_RECOVER'/> <reference name='HTML_PI_NODE' href='html/libxml-HTMLtree.html#HTML_PI_NODE'/> <reference name='HTML_PRESERVE_NODE' href='html/libxml-HTMLtree.html#HTML_PRESERVE_NODE'/> <reference name='HTML_REQUIRED' href='html/libxml-HTMLparser.html#HTML_REQUIRED'/> @@ -3440,6 +3441,7 @@ <ref name='HTML_PARSE_NONET'/> <ref name='HTML_PARSE_NOWARNING'/> <ref name='HTML_PARSE_PEDANTIC'/> + <ref name='HTML_PARSE_RECOVER'/> <ref name='HTML_PI_NODE'/> <ref name='HTML_PRESERVE_NODE'/> <ref name='HTML_REQUIRED'/> @@ -10308,6 +10310,7 @@ <ref name='HTML_PARSE_NONET'/> <ref name='HTML_PARSE_NOWARNING'/> <ref name='HTML_PARSE_PEDANTIC'/> + <ref name='HTML_PARSE_RECOVER'/> <ref name='HTML_REQUIRED'/> <ref name='HTML_VALID'/> <ref name='UTF8ToHtml'/> diff --git a/elfgcchack.h b/elfgcchack.h index 3af65aa7..ca69dbf1 100644 --- a/elfgcchack.h +++ b/elfgcchack.h @@ -8591,7 +8591,7 @@ extern __typeof (xmlSAX2EndDocument) xmlSAX2EndDocument__internal_alias __attrib #endif #endif -#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) +#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) #ifdef bottom_SAX2 #undef xmlSAX2EndElement extern __typeof (xmlSAX2EndElement) xmlSAX2EndElement __attribute((alias("xmlSAX2EndElement__internal_alias"))); @@ -8837,7 +8837,7 @@ extern __typeof (xmlSAX2StartDocument) xmlSAX2StartDocument__internal_alias __at #endif #endif -#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) +#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) #ifdef bottom_SAX2 #undef xmlSAX2StartElement extern __typeof (xmlSAX2StartElement) xmlSAX2StartElement __attribute((alias("xmlSAX2StartElement__internal_alias"))); @@ -496,7 +496,7 @@ xmlInitializeGlobalState(xmlGlobalStatePtr gs) xmlMutexLock(xmlThrDefMutex); -#if defined(LIBXML_DOCB_ENABLED) && defined(LIBXML_LEGACY_ENABLED) +#if defined(LIBXML_DOCB_ENABLED) && defined(LIBXML_LEGACY_ENABLED) && defined(LIBXML_SAX1_ENABLED) initdocbDefaultSAXHandler(&gs->docbDefaultSAXHandler); #endif #if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_LEGACY_ENABLED) diff --git a/include/libxml/SAX2.h b/include/libxml/SAX2.h index 66265645..8d2db02d 100644 --- a/include/libxml/SAX2.h +++ b/include/libxml/SAX2.h @@ -98,7 +98,7 @@ XMLPUBFUN void XMLCALL xmlSAX2StartDocument (void *ctx); XMLPUBFUN void XMLCALL xmlSAX2EndDocument (void *ctx); -#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) +#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) XMLPUBFUN void XMLCALL xmlSAX2StartElement (void *ctx, const xmlChar *fullname, diff --git a/include/libxml/xmlregexp.h b/include/libxml/xmlregexp.h index 63ae1a03..a257bb4d 100644 --- a/include/libxml/xmlregexp.h +++ b/include/libxml/xmlregexp.h @@ -197,7 +197,7 @@ XMLPUBFUN xmlExpNodePtr XMLCALL int len); XMLPUBFUN xmlExpNodePtr XMLCALL xmlExpExpDerive (xmlExpCtxtPtr ctxt, - xmlExpNodePtr exp, + xmlExpNodePtr expr, xmlExpNodePtr sub); XMLPUBFUN int XMLCALL xmlExpSubsume (xmlExpCtxtPtr ctxt, @@ -205,7 +205,7 @@ XMLPUBFUN int XMLCALL xmlExpNodePtr sub); XMLPUBFUN void XMLCALL xmlExpDump (xmlBufferPtr buf, - xmlExpNodePtr exp); + xmlExpNodePtr expr); #endif /* LIBXML_EXPR_ENABLED */ #ifdef __cplusplus } @@ -3529,7 +3529,7 @@ load_xpath_expr (xmlDocPtr parent_doc, const char* filename) { xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; xmlSubstituteEntitiesDefault(1); - doc = xmlParseFile(filename); + doc = xmlReadFile(filename, NULL, XML_PARSE_DTDATTR | XML_PARSE_NOENT); if (doc == NULL) { fprintf(stderr, "Error: unable to parse file \"%s\"\n", filename); return(NULL); @@ -3681,7 +3681,7 @@ c14nRunTest(const char* xml_filename, int with_comments, int exclusive, xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; xmlSubstituteEntitiesDefault(1); - doc = xmlParseFile(xml_filename); + doc = xmlReadFile(xml_filename, NULL, XML_PARSE_DTDATTR | XML_PARSE_NOENT); if (doc == NULL) { fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_filename); return(-1); @@ -3816,7 +3816,7 @@ c14nExcWithoutCommentTest(const char *filename, return(c14nCommonTest(filename, 0, 1, "exc-without-comments")); } #endif -#if defined(LIBXML_THREAD_ENABLED) && defined(LIBXML_CATALOG_ENABLED) +#if defined(LIBXML_THREAD_ENABLED) && defined(LIBXML_CATALOG_ENABLED) && defined (LIBXML_SAX1_ENABLED) /************************************************************************ * * * Catalog and threads test * @@ -4245,7 +4245,7 @@ testDesc testDescriptions[] = { c14nExcWithoutCommentTest, "./test/c14n/exc-without-comments/*.xml", NULL, NULL, NULL, 0 }, #endif -#if defined(LIBXML_THREAD_ENABLED) && defined(LIBXML_CATALOG_ENABLED) +#if defined(LIBXML_THREAD_ENABLED) && defined(LIBXML_CATALOG_ENABLED) && defined(LIBXML_SAX1_ENABLED) { "Catalog and Threads regression tests" , threadsTest, NULL, NULL, NULL, NULL, 0 }, @@ -63,7 +63,7 @@ test_c14n(const char* xml_filename, int with_comments, int exclusive, xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; xmlSubstituteEntitiesDefault(1); - doc = xmlParseFile(xml_filename); + doc = xmlReadFile(xml_filename, NULL, XML_PARSE_DTDATTR | XML_PARSE_NOENT); if (doc == NULL) { fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_filename); return(-1); @@ -237,7 +237,7 @@ load_xpath_expr (xmlDocPtr parent_doc, const char* filename) { xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; xmlSubstituteEntitiesDefault(1); - doc = xmlParseFile(filename); + doc = xmlReadFile(filename, NULL, XML_PARSE_DTDATTR | XML_PARSE_NOENT); if (doc == NULL) { fprintf(stderr, "Error: unable to parse file \"%s\"\n", filename); return(NULL); @@ -3913,7 +3913,7 @@ static int test_xmlSAX2EndElement(void) { int test_ret = 0; -#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) +#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) #ifdef LIBXML_SAX1_ENABLED int mem_base; void * ctx; /* the user data (XML parser context) */ @@ -4878,7 +4878,7 @@ static int test_xmlSAX2StartElement(void) { int test_ret = 0; -#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) +#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) #ifdef LIBXML_SAX1_ENABLED int mem_base; void * ctx; /* the user data (XML parser context) */ @@ -1133,8 +1133,10 @@ xmlFreeDoc(xmlDocPtr cur) { return; } #ifdef LIBXML_DEBUG_RUNTIME +#ifdef LIBXML_DEBUG_ENABLED xmlDebugCheckDocument(stderr, cur); #endif +#endif if (cur != NULL) dict = cur->dict; |