fix buffer interfaces

JuliaIO · Jan 12, 2020 · 80888c4 · 80888c4
1 parent 96c6fb7
commit 80888c4
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 46 deletions.
diff --git a/src/EzXML.jl b/src/EzXML.jl
@@ -108,7 +108,6 @@ using XML2_jll: libxml2
 include("error.jl")
 include("node.jl")
 include("document.jl")
-include("buffer.jl")
 include("xpath.jl")
 include("streamreader.jl")
 

diff --git a/src/buffer.jl b/src/buffer.jl
diff --git a/src/node.jl b/src/node.jl
@@ -323,21 +323,37 @@ function prettyprint(io::IO, node::Node)
     dump_node(io, node, true)
 end
 
-# Dump `node` to `io`.
-function dump_node(io, node, format)
+function dump_node(io::IO, node::Node, format::Bool)
     if hasdocument(node)
         doc_ptr = document(node).node.ptr
     else
-        doc_ptr = C_NULL
+        doc_ptr = convert(Ptr{_Node}, C_NULL)
+    end
+    buf_ptr = @check ccall(
+        (:xmlBufCreate, libxml2),
+        Ptr{Cvoid},
+        ()) != C_NULL
+    try
+        level = 0
+        size = ccall(
+            (:xmlBufNodeDump, libxml2),
+            Csize_t,
+            (Ptr{Cvoid}, Ptr{Cvoid}, Ptr{Cvoid}, Cint, Cint),
+            buf_ptr, doc_ptr, node.ptr, level, format)
+        content_ptr = @check ccall(
+            (:xmlBufContent, libxml2),
+            Ptr{UInt8},
+            (Ptr{Cvoid},),
+            buf_ptr) != C_NULL
+        unsafe_write(io, content_ptr, size)
+        return nothing
+    finally
+        ccall(
+            (:xmlBufFree, libxml2),
+            Cvoid,
+            (Ptr{Cvoid},),
+            buf_ptr)
     end
-    buf = Buffer()
-    level = 0
-    len = @check ccall(
-        (:xmlNodeDump, libxml2),
-        Cint,
-        (Ptr{Cvoid}, Ptr{Cvoid}, Ptr{Cvoid}, Cint, Cint),
-        buf.ptr, doc_ptr, node.ptr, level, format) != -1
-    print(io, unsafe_string(unsafe_load(buf.ptr).content))
 end
 
 function Base.:(==)(n1::Node, n2::Node)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1327,15 +1327,15 @@ end
 
         doc = parsexml("<e1><e2/></e1>")
         buf = IOBuffer()
-        print(buf, doc)
+        @test print(buf, doc) === nothing
         @test take!(buf) == b"""
         <?xml version="1.0" encoding="UTF-8"?>
         <e1><e2/></e1>
         """
 
         doc = parsexml("<e1><e2/></e1>")
         buf = IOBuffer()
-        prettyprint(buf, doc)
+        @test prettyprint(buf, doc) === nothing
         @test take!(buf) == b"""
         <?xml version="1.0" encoding="UTF-8"?>
         <e1>