From 3c0e515672941dae1e3acccd56705a3da15c7f68 Mon Sep 17 00:00:00 2001 From: Mus M Date: Sun, 30 Jul 2017 15:10:58 -0400 Subject: [PATCH 1/2] update cfunction tuple call type --- src/LibExpat.jl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/LibExpat.jl b/src/LibExpat.jl index 22ae0a8..4c4ffa7 100644 --- a/src/LibExpat.jl +++ b/src/LibExpat.jl @@ -90,16 +90,16 @@ end function xp_make_parser(sep='\0') - cb_start_cdata = cfunction(start_cdata, Void, (Ptr{Void},)) - cb_end_cdata = cfunction(end_cdata, Void, (Ptr{Void},)) - cb_cdata = cfunction(cdata, Void, (Ptr{Void},Ptr{UInt8}, Cint)) - cb_comment = cfunction(comment, Void, (Ptr{Void},Ptr{UInt8})) - cb_default = cfunction(default, Void, (Ptr{Void},Ptr{UInt8}, Cint)) - cb_default_expand = cfunction(default_expand, Void, (Ptr{Void},Ptr{UInt8}, Cint)) - cb_start_element = cfunction(start_element, Void, (Ptr{Void},Ptr{UInt8}, Ptr{Ptr{UInt8}})) - cb_end_element = cfunction(end_element, Void, (Ptr{Void},Ptr{UInt8})) - cb_start_namespace = cfunction(start_namespace, Void, (Ptr{Void},Ptr{UInt8}, Ptr{UInt8})) - cb_end_namespace = cfunction(end_namespace, Void, (Ptr{Void},Ptr{UInt8})) + cb_start_cdata = cfunction(start_cdata, Void, Tuple{Ptr{Void}}) + cb_end_cdata = cfunction(end_cdata, Void, Tuple{Ptr{Void}}) + cb_cdata = cfunction(cdata, Void, Tuple{Ptr{Void}, Ptr{UInt8}, Cint}) + cb_comment = cfunction(comment, Void, Tuple{Ptr{Void}, Ptr{UInt8}}) + cb_default = cfunction(default, Void, Tuple{Ptr{Void}, Ptr{UInt8}, Cint}) + cb_default_expand = cfunction(default_expand, Void, Tuple{Ptr{Void}, Ptr{UInt8}, Cint}) + cb_start_element = cfunction(start_element, Void, Tuple{Ptr{Void}, Ptr{UInt8}, Ptr{Ptr{UInt8}}}) + cb_end_element = cfunction(end_element, Void, Tuple{Ptr{Void}, Ptr{UInt8}}) + cb_start_namespace = cfunction(start_namespace, Void, Tuple{Ptr{Void}, Ptr{UInt8}, Ptr{UInt8}}) + cb_end_namespace = cfunction(end_namespace, Void, Tuple{Ptr{Void}, Ptr{UInt8}}) p::XML_Parser = (sep == '\0') ? XML_ParserCreate(C_NULL) : XML_ParserCreateNS(C_NULL, sep); if (p == C_NULL) error("XML_ParserCreate failed") end From a3c3a517a3f5ccc0dd627b6b09b1a262a52bc7a5 Mon Sep 17 00:00:00 2001 From: Mus M Date: Sun, 30 Jul 2017 15:15:00 -0400 Subject: [PATCH 2/2] Update streaming.jl --- src/streaming.jl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/streaming.jl b/src/streaming.jl index b26e574..14d33cb 100644 --- a/src/streaming.jl +++ b/src/streaming.jl @@ -137,16 +137,16 @@ end function make_parser(cbs::XPCallbacks,data=nothing,sep='\0') - cb_streaming_start_cdata = cfunction(streaming_start_cdata, Void, (Ptr{Void},)) - cb_streaming_end_cdata = cfunction(streaming_end_cdata, Void, (Ptr{Void},)) - cb_streaming_cdata = cfunction(streaming_cdata, Void, (Ptr{Void},Ptr{UInt8}, Cint)) - cb_streaming_comment = cfunction(streaming_comment, Void, (Ptr{Void},Ptr{UInt8})) - cb_streaming_default = cfunction(streaming_default, Void, (Ptr{Void},Ptr{UInt8}, Cint)) - cb_streaming_default_expand = cfunction(streaming_default_expand, Void, (Ptr{Void},Ptr{UInt8}, Cint)) - cb_streaming_start_element = cfunction(streaming_start_element, Void, (Ptr{Void},Ptr{UInt8}, Ptr{Ptr{UInt8}})) - cb_streaming_end_element = cfunction(streaming_end_element, Void, (Ptr{Void},Ptr{UInt8})) - cb_streaming_start_namespace = cfunction(streaming_start_namespace, Void, (Ptr{Void},Ptr{UInt8}, Ptr{UInt8})) - cb_streaming_end_namespace = cfunction(streaming_end_namespace, Void, (Ptr{Void},Ptr{UInt8})) + cb_streaming_start_cdata = cfunction(streaming_start_cdata, Void, Tuple{Ptr{Void}}) + cb_streaming_end_cdata = cfunction(streaming_end_cdata, Void, Tuple{Ptr{Void}}) + cb_streaming_cdata = cfunction(streaming_cdata, Void, Tuple{Ptr{Void}, Ptr{UInt8}, Cint}) + cb_streaming_comment = cfunction(streaming_comment, Void, Tuple{Ptr{Void}, Ptr{UInt8}}) + cb_streaming_default = cfunction(streaming_default, Void, Tuple{Ptr{Void}, Ptr{UInt8}, Cint}) + cb_streaming_default_expand = cfunction(streaming_default_expand, Void, Tuple{Ptr{Void}, Ptr{UInt8}, Cint}) + cb_streaming_start_element = cfunction(streaming_start_element, Void, Tuple{Ptr{Void}, Ptr{UInt8}, Ptr{Ptr{UInt8}}}) + cb_streaming_end_element = cfunction(streaming_end_element, Void, Tuple{Ptr{Void}, Ptr{UInt8}}) + cb_streaming_start_namespace = cfunction(streaming_start_namespace, Void, Tuple{Ptr{Void}, Ptr{UInt8}, Ptr{UInt8}}) + cb_streaming_end_namespace = cfunction(streaming_end_namespace, Void, Tuple{Ptr{Void}, Ptr{UInt8}}) p::XML_Parser = (sep == '\0') ? XML_ParserCreate(C_NULL) : XML_ParserCreateNS(C_NULL, sep); if (p == C_NULL) error("XML_ParserCreate failed") end