combine easy buffers (errbuf & readbuf)

Author: StefanKarpinski

src/Curl/Easy.jl

@@ -8,8 +8,7 @@ mutable struct Easy
     req_hdrs :: Ptr{curl_slist_t}
     res_hdrs :: Vector{String}
     code     :: CURLcode
-    errbuf   :: Vector{UInt8}
-    readbuf  :: Vector{UInt8}
+    buffer   :: Vector{UInt8}
 end
 
 function Easy(
@@ -28,7 +27,6 @@ function Easy(
         String[],
         typemax(CURLcode),
         zeros(UInt8, CURL_ERROR_SIZE),
-        zeros(UInt8, 0),
     )
     finalizer(done!, easy)
     add_callbacks(easy)
@@ -279,9 +277,9 @@ end
 
 function get_curl_errstr(easy::Easy)
     easy.code == Curl.CURLE_OK && return ""
-    errstr = easy.errbuf[1] == 0 ?
+    errstr = easy.buffer[1] == 0 ?
         unsafe_string(Curl.curl_easy_strerror(easy.code)) :
-        GC.@preserve easy unsafe_string(pointer(easy.errbuf))
+        GC.@preserve easy unsafe_string(pointer(easy.buffer))
     return chomp(errstr)
 end
 
@@ -308,8 +306,8 @@ function read_callback(
 )::Csize_t
     easy = unsafe_pointer_to_objref(easy_p)::Easy
     eof(easy.input) && return 0
-    n = readbytes!(easy.input, easy.readbuf, size*count)
-    ccall(:memcpy, Ptr{Cvoid}, (Ptr{Cvoid}, Ptr{Cvoid}, Csize_t), data, easy.readbuf, n)
+    n = readbytes!(easy.input, easy.buffer, size*count)
+    ccall(:memcpy, Ptr{Cvoid}, (Ptr{Cvoid}, Ptr{Cvoid}, Csize_t), data, easy.buffer, n)
     return n
 end
 
@@ -363,8 +361,8 @@ function add_callbacks(easy::Easy)
     setopt(easy, CURLOPT_PRIVATE, easy_p)
 
     # pointer to error buffer
-    errbuf_p = pointer(easy.errbuf)
-    setopt(easy, CURLOPT_ERRORBUFFER, errbuf_p)
+    buffer_p = pointer(easy.buffer)
+    setopt(easy, CURLOPT_ERRORBUFFER, buffer_p)
 
     # set header callback
     header_cb = @cfunction(header_callback,