From: Nicolas Bruguier <nicolas.bruguier@supersonicimagine.fr>
Date: Tue, 6 Apr 2010 22:33:23 +0000 (-0700)
Subject: libxml-2.0: assorted SAX-related fixes
X-Git-Tag: 0.8.1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59d2d2689e61b39151ab9007f8653f7403d5d62f;p=thirdparty%2Fvala.git

libxml-2.0: assorted SAX-related fixes

Fixes bug 613953.
---

diff --git a/vapi/libxml-2.0.vapi b/vapi/libxml-2.0.vapi
index d9a779770..99a3e84bb 100644
--- a/vapi/libxml-2.0.vapi
+++ b/vapi/libxml-2.0.vapi
@@ -792,6 +792,7 @@ namespace Xml {
 	[CCode (cname = "xmlParserCtxt")]
 	public class ParserCtxt {
 		public SAXHandler* sax;
+		[CCode (cname = "userData")]
 		public void* user_data;
 
 		[CCode (cname = "xmlParseDocument")]
@@ -1476,10 +1477,10 @@ namespace Xml {
 	public delegate void startDocumentSAXFunc (void* ctx);
 
 	[CCode (cname = "startElementNsSAX2Func", has_target = false)]
-	public delegate void startElementNsSAX2Func (void* ctx, string localname, string prefix, string URI, int nb_namespaces, [CCode (array_length = false)] string[] namespaces, int nb_attributes, int nb_defaulted, [CCode (array_length = false)] string[] attributes);
+	public delegate void startElementNsSAX2Func (void* ctx, string localname, string prefix, string URI, int nb_namespaces, [CCode (array_length = false, array_null_terminated = true)] string[] namespaces, int nb_attributes, int nb_defaulted, [CCode (array_length = false)] string[] attributes);
 
 	[CCode (cname = "startElementSAXFunc", has_target = false)]
-	public delegate void startElementSAXFunc (void* ctx, string name, [CCode (array_length = false)] string[] atts);
+	public delegate void startElementSAXFunc (void* ctx, string name, [CCode (array_length = false, array_null_terminated = true)] string[] atts);
 
 	[CCode (cname = "unparsedEntityDeclSAXFunc", has_target = false)]
 	public delegate void unparsedEntityDeclSAXFunc (void* ctx, string name, string publicId, string systemId, string notationName);
@@ -1491,7 +1492,7 @@ namespace Xml {
 	public delegate void xmlStructuredErrorFunc (void* ctx, Error* error);
 
 	[Compact]
-	[CCode (cname = "xmlSAXHandler")]
+	[CCode (cname = "xmlSAXHandler", cheader_filename = "libxml/parser.h")]
 	public struct SAXHandler {
 		[CCode (cname = "internalSubset")]
 		public internalSubsetSAXFunc internalSubset;
@@ -1547,9 +1548,9 @@ namespace Xml {
 		public endElementNsSAX2Func endElementNs;
 		public xmlStructuredErrorFunc serror;
 
-		[CCode (cname = "UserParseMemory")]
+		[CCode (cname = "xmlSAXUserParseMemory")]
 		public int user_parse_memory (void* user_data, string buffer, int size);
-		[CCode (cname = "UserParseFile")]
+		[CCode (cname = "xmlSAXUserParseFile")]
 		public int user_parse_file (void* user_data, string filename);
 	}