aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksey Sanin <aleksey@src.gnome.org>2007-01-03 23:13:12 +0000
committerAleksey Sanin <aleksey@src.gnome.org>2007-01-03 23:13:12 +0000
commitd837764002051a4f95c0bee2d0c25f5b18a8f077 (patch)
tree04f2511b0e9d9bec624a5aeb22d8be5fd90bab5b
parent9cb1b64ddefdd832bee2fd49a7745c3d3f342318 (diff)
downloadandroid_external_libxml2-d837764002051a4f95c0bee2d0c25f5b18a8f077.tar.gz
android_external_libxml2-d837764002051a4f95c0bee2d0c25f5b18a8f077.tar.bz2
android_external_libxml2-d837764002051a4f95c0bee2d0c25f5b18a8f077.zip
expose xmlTextReaderSetup function
svn path=/trunk/; revision=3571
-rw-r--r--ChangeLog4
-rw-r--r--include/libxml/xmlreader.h6
-rw-r--r--win32/libxml2.def.src1
-rw-r--r--xmlreader.c2
4 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e09172c6..75d7c84b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 3 16:05:21 PST 2007 Aleksey Sanin <aleksey@aleksey.com>
+ * xmlreader.c include/libxml/xmlreader.h win32/libxml2.def.src:
+ expose xmlTextReaderSetup() function
+
Wed Jan 3 16:14:13 CET 2007 Daniel Veillard <daniel@veillard.com>
* configure.in: adapt the extra versioning code to SVN
diff --git a/include/libxml/xmlreader.h b/include/libxml/xmlreader.h
index 1d12988f..dfe51a3b 100644
--- a/include/libxml/xmlreader.h
+++ b/include/libxml/xmlreader.h
@@ -113,9 +113,15 @@ XMLPUBFUN xmlTextReaderPtr XMLCALL
const char *URI);
XMLPUBFUN xmlTextReaderPtr XMLCALL
xmlNewTextReaderFilename(const char *URI);
+
XMLPUBFUN void XMLCALL
xmlFreeTextReader (xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+ xmlTextReaderSetup(xmlTextReaderPtr reader,
+ xmlParserInputBufferPtr input, const char *URL,
+ const char *encoding, int options);
+
/*
* Iterators
*/
diff --git a/win32/libxml2.def.src b/win32/libxml2.def.src
index 367f248f..24adaf7d 100644
--- a/win32/libxml2.def.src
+++ b/win32/libxml2.def.src
@@ -1949,6 +1949,7 @@ xmlTextReaderSetErrorHandler
xmlTextReaderSetParserProp
xmlTextReaderSetSchema
xmlTextReaderSetStructuredErrorHandler
+xmlTextReaderSetup
xmlTextReaderStandalone
xmlTextReaderValue
xmlTextReaderXmlLang
diff --git a/xmlreader.c b/xmlreader.c
index c8bcf7b2..cd32cc30 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -4855,7 +4855,7 @@ xmlTextReaderGetErrorHandler(xmlTextReaderPtr reader,
*
* Returns 0 in case of success and -1 in case of error.
*/
-static int
+int
xmlTextReaderSetup(xmlTextReaderPtr reader,
xmlParserInputBufferPtr input, const char *URL,
const char *encoding, int options)