Skip to content

Commit 1bbc089

Browse files
GnimucGnimuc
committed
fix-up
1 parent bd35310 commit 1bbc089

14 files changed

+187
-185
lines changed

‎src/LibCURL.jl

+5-3
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,27 @@ elseif Sys.iswindows() && Sys.ARCH === :x86_64
4242
include("wrappers/x86_64-w64-mingw32.jl")
4343
end
4444

45-
# curl_easy_getinfo, curl_easy_setopt, and curl_multi_setopt are vararg C functions
45+
# curl_share_setopt, curl_easy_getinfo, curl_easy_setopt, and curl_multi_setopt are vararg C functions
46+
curl_share_setopt(handle, opt, param) = ccall((:curl_share_setopt, libcurl), CURLSHcode, (Ptr{CURLSH}, CURLSHoption, Any...), handle, opt, param)
4647

4748
curl_easy_setopt(handle, opt, ptrval::Array{T}) where T = ccall((:curl_easy_setopt, libcurl), CURLcode, (Ptr{CURL}, CURLoption, Ptr{T}...), handle, opt, ptrval)
4849
curl_easy_setopt(handle, opt, ptrval::Integer) = ccall((:curl_easy_setopt, libcurl), CURLcode, (Ptr{CURL}, CURLoption, Clong...), handle, opt, ptrval)
4950
curl_easy_setopt(handle, opt, ptrval::Ptr{T}) where {T} = ccall((:curl_easy_setopt, libcurl), CURLcode, (Ptr{CURL}, CURLoption, Ptr{T}...), handle, opt, ptrval)
5051
curl_easy_setopt(handle, opt, ptrval::AbstractString) = ccall((:curl_easy_setopt, libcurl), CURLcode, (Ptr{CURL}, CURLoption, Ptr{UInt8}...), handle, opt, ptrval)
52+
curl_easy_setopt(handle, opt, param) = ccall((:curl_easy_setopt, libcurl), CURLcode, (Ptr{CURL}, CURLoption, Any...), handle, opt, param)
5153

5254
curl_multi_setopt(handle, opt, ptrval::Array{T}) where T = ccall((:curl_multi_setopt, libcurl), CURLMcode, (Ptr{CURLM}, CURLMoption, Ptr{T}...), handle, opt, ptrval)
5355
curl_multi_setopt(handle, opt, ptrval::Integer) = ccall((:curl_multi_setopt, libcurl), CURLMcode, (Ptr{CURLM}, CURLMoption, Clong...), handle, opt, ptrval)
5456
curl_multi_setopt(handle, opt, ptrval::Ptr{T}) where {T} = ccall((:curl_multi_setopt, libcurl), CURLMcode, (Ptr{CURLM}, CURLMoption, Ptr{T}...), handle, opt, ptrval)
5557
curl_multi_setopt(handle, opt, ptrval::AbstractString) = ccall((:curl_multi_setopt, libcurl), CURLMcode, (Ptr{CURLM}, CURLMoption, Ptr{UInt8}...), handle, opt, ptrval)
58+
curl_multi_setopt(multi_handle, opt, param) = ccall((:curl_multi_setopt, libcurl), CURLMcode, (Ptr{CURLM}, CURLMoption, Any...), multi_handle, opt, param)
5659

5760
curl_easy_getinfo(handle, opt, ptrval::Array{T}) where T = ccall((:curl_easy_getinfo, libcurl), CURLcode, (Ptr{CURL}, CURLoption, Ptr{T}...), handle, opt, ptrval)
5861
curl_easy_getinfo(handle, opt, ptrval::AbstractString) = ccall((:curl_easy_getinfo, libcurl), CURLcode, (Ptr{CURL}, CURLoption, Ptr{UInt8}...), handle, opt, ptrval)
62+
curl_easy_getinfo(handle, info, arg) = ccall((:curl_easy_getinfo, libcurl), CURLcode, (Ptr{CURL}, CURLINFO, Any...), handle, info, arg)
5963

6064
include("Mime_ext.jl")
6165

62-
63-
6466
# exports
6567
const PREFIXES = ["curl_", "CURLOPT_", "CURLFORM_", "CURLE_", "CURLINFO_", "CURLSSH_", "CURLAUTH_", "CURLM", "CURL"]
6668
foreach(names(@__MODULE__; all=true)) do s

‎src/wrappers/aarch64-linux-gnu.jl

+14-14
Original file line numberDiff line numberDiff line change
@@ -1529,7 +1529,7 @@ const CURL_FORMAT_CURL_OFF_TU = "lu"
15291529

15301530
const CURL_TYPEOF_CURL_SOCKLEN_T = socklen_t
15311531

1532-
# Skipping MacroDefinition: CURL_SOCKET_BAD - 1
1532+
const CURL_SOCKET_BAD = -1
15331533

15341534
const CURLSSLBACKEND_LIBRESSL = CURLSSLBACKEND_OPENSSL
15351535

@@ -1697,33 +1697,33 @@ const CURLOPT_WRITEINFO = CURLOPT_OBSOLETE40
16971697

16981698
const CURLOPT_CLOSEPOLICY = CURLOPT_OBSOLETE72
16991699

1700-
# Skipping MacroDefinition: CURLAUTH_NONE ( ( unsigned long ) 0 )
1700+
const CURLAUTH_NONE = Culong(0)
17011701

1702-
# Skipping MacroDefinition: CURLAUTH_BASIC ( ( ( unsigned long ) 1 ) << 0 )
1702+
const CURLAUTH_BASIC = Culong(1) << 0
17031703

1704-
# Skipping MacroDefinition: CURLAUTH_DIGEST ( ( ( unsigned long ) 1 ) << 1 )
1704+
const CURLAUTH_DIGEST = Culong(1) << 1
17051705

1706-
# Skipping MacroDefinition: CURLAUTH_NEGOTIATE ( ( ( unsigned long ) 1 ) << 2 )
1706+
const CURLAUTH_NEGOTIATE = Culong(1) << 2
17071707

17081708
const CURLAUTH_GSSNEGOTIATE = CURLAUTH_NEGOTIATE
17091709

17101710
const CURLAUTH_GSSAPI = CURLAUTH_NEGOTIATE
17111711

1712-
# Skipping MacroDefinition: CURLAUTH_NTLM ( ( ( unsigned long ) 1 ) << 3 )
1712+
const CURLAUTH_NTLM = Culong(1) << 3
17131713

1714-
# Skipping MacroDefinition: CURLAUTH_DIGEST_IE ( ( ( unsigned long ) 1 ) << 4 )
1714+
const CURLAUTH_DIGEST_IE = Culong(1) << 4
17151715

1716-
# Skipping MacroDefinition: CURLAUTH_NTLM_WB ( ( ( unsigned long ) 1 ) << 5 )
1716+
const CURLAUTH_NTLM_WB = Culong(1) << 5
17171717

1718-
# Skipping MacroDefinition: CURLAUTH_BEARER ( ( ( unsigned long ) 1 ) << 6 )
1718+
const CURLAUTH_BEARER = Culong(1) << 6
17191719

1720-
# Skipping MacroDefinition: CURLAUTH_ONLY ( ( ( unsigned long ) 1 ) << 31 )
1720+
const CURLAUTH_ONLY = Culong(1) << 31
17211721

1722-
# Skipping MacroDefinition: CURLAUTH_ANY ( ~ CURLAUTH_DIGEST_IE )
1722+
const CURLAUTH_ANY = ~CURLAUTH_DIGEST_IE
17231723

1724-
# Skipping MacroDefinition: CURLAUTH_ANYSAFE ( ~ ( CURLAUTH_BASIC | CURLAUTH_DIGEST_IE ) )
1724+
const CURLAUTH_ANYSAFE = ~(CURLAUTH_BASIC | CURLAUTH_DIGEST_IE)
17251725

1726-
# Skipping MacroDefinition: CURLSSH_AUTH_ANY ~ 0
1726+
const CURLSSH_AUTH_ANY = ~0
17271727

17281728
const CURLSSH_AUTH_NONE = 0
17291729

@@ -1847,7 +1847,7 @@ const CURLPROTO_SMBS = 1 << 27
18471847

18481848
const CURLPROTO_MQTT = 1 << 28
18491849

1850-
# Skipping MacroDefinition: CURLPROTO_ALL ( ~ 0 )
1850+
const CURLPROTO_ALL = ~0
18511851

18521852
const CURLOPTTYPE_LONG = 0
18531853

‎src/wrappers/aarch64-linux-musl.jl

+14-14
Original file line numberDiff line numberDiff line change
@@ -1523,7 +1523,7 @@ const CURL_FORMAT_CURL_OFF_TU = "lu"
15231523

15241524
const CURL_TYPEOF_CURL_SOCKLEN_T = socklen_t
15251525

1526-
# Skipping MacroDefinition: CURL_SOCKET_BAD - 1
1526+
const CURL_SOCKET_BAD = -1
15271527

15281528
const CURLSSLBACKEND_LIBRESSL = CURLSSLBACKEND_OPENSSL
15291529

@@ -1691,33 +1691,33 @@ const CURLOPT_WRITEINFO = CURLOPT_OBSOLETE40
16911691

16921692
const CURLOPT_CLOSEPOLICY = CURLOPT_OBSOLETE72
16931693

1694-
# Skipping MacroDefinition: CURLAUTH_NONE ( ( unsigned long ) 0 )
1694+
const CURLAUTH_NONE = Culong(0)
16951695

1696-
# Skipping MacroDefinition: CURLAUTH_BASIC ( ( ( unsigned long ) 1 ) << 0 )
1696+
const CURLAUTH_BASIC = Culong(1) << 0
16971697

1698-
# Skipping MacroDefinition: CURLAUTH_DIGEST ( ( ( unsigned long ) 1 ) << 1 )
1698+
const CURLAUTH_DIGEST = Culong(1) << 1
16991699

1700-
# Skipping MacroDefinition: CURLAUTH_NEGOTIATE ( ( ( unsigned long ) 1 ) << 2 )
1700+
const CURLAUTH_NEGOTIATE = Culong(1) << 2
17011701

17021702
const CURLAUTH_GSSNEGOTIATE = CURLAUTH_NEGOTIATE
17031703

17041704
const CURLAUTH_GSSAPI = CURLAUTH_NEGOTIATE
17051705

1706-
# Skipping MacroDefinition: CURLAUTH_NTLM ( ( ( unsigned long ) 1 ) << 3 )
1706+
const CURLAUTH_NTLM = Culong(1) << 3
17071707

1708-
# Skipping MacroDefinition: CURLAUTH_DIGEST_IE ( ( ( unsigned long ) 1 ) << 4 )
1708+
const CURLAUTH_DIGEST_IE = Culong(1) << 4
17091709

1710-
# Skipping MacroDefinition: CURLAUTH_NTLM_WB ( ( ( unsigned long ) 1 ) << 5 )
1710+
const CURLAUTH_NTLM_WB = Culong(1) << 5
17111711

1712-
# Skipping MacroDefinition: CURLAUTH_BEARER ( ( ( unsigned long ) 1 ) << 6 )
1712+
const CURLAUTH_BEARER = Culong(1) << 6
17131713

1714-
# Skipping MacroDefinition: CURLAUTH_ONLY ( ( ( unsigned long ) 1 ) << 31 )
1714+
const CURLAUTH_ONLY = Culong(1) << 31
17151715

1716-
# Skipping MacroDefinition: CURLAUTH_ANY ( ~ CURLAUTH_DIGEST_IE )
1716+
const CURLAUTH_ANY = ~CURLAUTH_DIGEST_IE
17171717

1718-
# Skipping MacroDefinition: CURLAUTH_ANYSAFE ( ~ ( CURLAUTH_BASIC | CURLAUTH_DIGEST_IE ) )
1718+
const CURLAUTH_ANYSAFE = ~(CURLAUTH_BASIC | CURLAUTH_DIGEST_IE)
17191719

1720-
# Skipping MacroDefinition: CURLSSH_AUTH_ANY ~ 0
1720+
const CURLSSH_AUTH_ANY = ~0
17211721

17221722
const CURLSSH_AUTH_NONE = 0
17231723

@@ -1841,7 +1841,7 @@ const CURLPROTO_SMBS = 1 << 27
18411841

18421842
const CURLPROTO_MQTT = 1 << 28
18431843

1844-
# Skipping MacroDefinition: CURLPROTO_ALL ( ~ 0 )
1844+
const CURLPROTO_ALL = ~0
18451845

18461846
const CURLOPTTYPE_LONG = 0
18471847

‎src/wrappers/armv7l-linux-gnueabihf.jl

+14-14
Original file line numberDiff line numberDiff line change
@@ -1529,7 +1529,7 @@ const CURL_FORMAT_CURL_OFF_TU = "llu"
15291529

15301530
const CURL_TYPEOF_CURL_SOCKLEN_T = socklen_t
15311531

1532-
# Skipping MacroDefinition: CURL_SOCKET_BAD - 1
1532+
const CURL_SOCKET_BAD = -1
15331533

15341534
const CURLSSLBACKEND_LIBRESSL = CURLSSLBACKEND_OPENSSL
15351535

@@ -1697,33 +1697,33 @@ const CURLOPT_WRITEINFO = CURLOPT_OBSOLETE40
16971697

16981698
const CURLOPT_CLOSEPOLICY = CURLOPT_OBSOLETE72
16991699

1700-
# Skipping MacroDefinition: CURLAUTH_NONE ( ( unsigned long ) 0 )
1700+
const CURLAUTH_NONE = Culong(0)
17011701

1702-
# Skipping MacroDefinition: CURLAUTH_BASIC ( ( ( unsigned long ) 1 ) << 0 )
1702+
const CURLAUTH_BASIC = Culong(1) << 0
17031703

1704-
# Skipping MacroDefinition: CURLAUTH_DIGEST ( ( ( unsigned long ) 1 ) << 1 )
1704+
const CURLAUTH_DIGEST = Culong(1) << 1
17051705

1706-
# Skipping MacroDefinition: CURLAUTH_NEGOTIATE ( ( ( unsigned long ) 1 ) << 2 )
1706+
const CURLAUTH_NEGOTIATE = Culong(1) << 2
17071707

17081708
const CURLAUTH_GSSNEGOTIATE = CURLAUTH_NEGOTIATE
17091709

17101710
const CURLAUTH_GSSAPI = CURLAUTH_NEGOTIATE
17111711

1712-
# Skipping MacroDefinition: CURLAUTH_NTLM ( ( ( unsigned long ) 1 ) << 3 )
1712+
const CURLAUTH_NTLM = Culong(1) << 3
17131713

1714-
# Skipping MacroDefinition: CURLAUTH_DIGEST_IE ( ( ( unsigned long ) 1 ) << 4 )
1714+
const CURLAUTH_DIGEST_IE = Culong(1) << 4
17151715

1716-
# Skipping MacroDefinition: CURLAUTH_NTLM_WB ( ( ( unsigned long ) 1 ) << 5 )
1716+
const CURLAUTH_NTLM_WB = Culong(1) << 5
17171717

1718-
# Skipping MacroDefinition: CURLAUTH_BEARER ( ( ( unsigned long ) 1 ) << 6 )
1718+
const CURLAUTH_BEARER = Culong(1) << 6
17191719

1720-
# Skipping MacroDefinition: CURLAUTH_ONLY ( ( ( unsigned long ) 1 ) << 31 )
1720+
const CURLAUTH_ONLY = Culong(1) << 31
17211721

1722-
# Skipping MacroDefinition: CURLAUTH_ANY ( ~ CURLAUTH_DIGEST_IE )
1722+
const CURLAUTH_ANY = ~CURLAUTH_DIGEST_IE
17231723

1724-
# Skipping MacroDefinition: CURLAUTH_ANYSAFE ( ~ ( CURLAUTH_BASIC | CURLAUTH_DIGEST_IE ) )
1724+
const CURLAUTH_ANYSAFE = ~(CURLAUTH_BASIC | CURLAUTH_DIGEST_IE)
17251725

1726-
# Skipping MacroDefinition: CURLSSH_AUTH_ANY ~ 0
1726+
const CURLSSH_AUTH_ANY = ~0
17271727

17281728
const CURLSSH_AUTH_NONE = 0
17291729

@@ -1847,7 +1847,7 @@ const CURLPROTO_SMBS = 1 << 27
18471847

18481848
const CURLPROTO_MQTT = 1 << 28
18491849

1850-
# Skipping MacroDefinition: CURLPROTO_ALL ( ~ 0 )
1850+
const CURLPROTO_ALL = ~0
18511851

18521852
const CURLOPTTYPE_LONG = 0
18531853

‎src/wrappers/armv7l-linux-musleabihf.jl

+14-14
Original file line numberDiff line numberDiff line change
@@ -1523,7 +1523,7 @@ const CURL_FORMAT_CURL_OFF_TU = "llu"
15231523

15241524
const CURL_TYPEOF_CURL_SOCKLEN_T = socklen_t
15251525

1526-
# Skipping MacroDefinition: CURL_SOCKET_BAD - 1
1526+
const CURL_SOCKET_BAD = -1
15271527

15281528
const CURLSSLBACKEND_LIBRESSL = CURLSSLBACKEND_OPENSSL
15291529

@@ -1691,33 +1691,33 @@ const CURLOPT_WRITEINFO = CURLOPT_OBSOLETE40
16911691

16921692
const CURLOPT_CLOSEPOLICY = CURLOPT_OBSOLETE72
16931693

1694-
# Skipping MacroDefinition: CURLAUTH_NONE ( ( unsigned long ) 0 )
1694+
const CURLAUTH_NONE = Culong(0)
16951695

1696-
# Skipping MacroDefinition: CURLAUTH_BASIC ( ( ( unsigned long ) 1 ) << 0 )
1696+
const CURLAUTH_BASIC = Culong(1) << 0
16971697

1698-
# Skipping MacroDefinition: CURLAUTH_DIGEST ( ( ( unsigned long ) 1 ) << 1 )
1698+
const CURLAUTH_DIGEST = Culong(1) << 1
16991699

1700-
# Skipping MacroDefinition: CURLAUTH_NEGOTIATE ( ( ( unsigned long ) 1 ) << 2 )
1700+
const CURLAUTH_NEGOTIATE = Culong(1) << 2
17011701

17021702
const CURLAUTH_GSSNEGOTIATE = CURLAUTH_NEGOTIATE
17031703

17041704
const CURLAUTH_GSSAPI = CURLAUTH_NEGOTIATE
17051705

1706-
# Skipping MacroDefinition: CURLAUTH_NTLM ( ( ( unsigned long ) 1 ) << 3 )
1706+
const CURLAUTH_NTLM = Culong(1) << 3
17071707

1708-
# Skipping MacroDefinition: CURLAUTH_DIGEST_IE ( ( ( unsigned long ) 1 ) << 4 )
1708+
const CURLAUTH_DIGEST_IE = Culong(1) << 4
17091709

1710-
# Skipping MacroDefinition: CURLAUTH_NTLM_WB ( ( ( unsigned long ) 1 ) << 5 )
1710+
const CURLAUTH_NTLM_WB = Culong(1) << 5
17111711

1712-
# Skipping MacroDefinition: CURLAUTH_BEARER ( ( ( unsigned long ) 1 ) << 6 )
1712+
const CURLAUTH_BEARER = Culong(1) << 6
17131713

1714-
# Skipping MacroDefinition: CURLAUTH_ONLY ( ( ( unsigned long ) 1 ) << 31 )
1714+
const CURLAUTH_ONLY = Culong(1) << 31
17151715

1716-
# Skipping MacroDefinition: CURLAUTH_ANY ( ~ CURLAUTH_DIGEST_IE )
1716+
const CURLAUTH_ANY = ~CURLAUTH_DIGEST_IE
17171717

1718-
# Skipping MacroDefinition: CURLAUTH_ANYSAFE ( ~ ( CURLAUTH_BASIC | CURLAUTH_DIGEST_IE ) )
1718+
const CURLAUTH_ANYSAFE = ~(CURLAUTH_BASIC | CURLAUTH_DIGEST_IE)
17191719

1720-
# Skipping MacroDefinition: CURLSSH_AUTH_ANY ~ 0
1720+
const CURLSSH_AUTH_ANY = ~0
17211721

17221722
const CURLSSH_AUTH_NONE = 0
17231723

@@ -1841,7 +1841,7 @@ const CURLPROTO_SMBS = 1 << 27
18411841

18421842
const CURLPROTO_MQTT = 1 << 28
18431843

1844-
# Skipping MacroDefinition: CURLPROTO_ALL ( ~ 0 )
1844+
const CURLPROTO_ALL = ~0
18451845

18461846
const CURLOPTTYPE_LONG = 0
18471847

‎src/wrappers/i686-linux-gnu.jl

+14-14
Original file line numberDiff line numberDiff line change
@@ -1529,7 +1529,7 @@ const CURL_FORMAT_CURL_OFF_TU = "llu"
15291529

15301530
const CURL_TYPEOF_CURL_SOCKLEN_T = socklen_t
15311531

1532-
# Skipping MacroDefinition: CURL_SOCKET_BAD - 1
1532+
const CURL_SOCKET_BAD = -1
15331533

15341534
const CURLSSLBACKEND_LIBRESSL = CURLSSLBACKEND_OPENSSL
15351535

@@ -1697,33 +1697,33 @@ const CURLOPT_WRITEINFO = CURLOPT_OBSOLETE40
16971697

16981698
const CURLOPT_CLOSEPOLICY = CURLOPT_OBSOLETE72
16991699

1700-
# Skipping MacroDefinition: CURLAUTH_NONE ( ( unsigned long ) 0 )
1700+
const CURLAUTH_NONE = Culong(0)
17011701

1702-
# Skipping MacroDefinition: CURLAUTH_BASIC ( ( ( unsigned long ) 1 ) << 0 )
1702+
const CURLAUTH_BASIC = Culong(1) << 0
17031703

1704-
# Skipping MacroDefinition: CURLAUTH_DIGEST ( ( ( unsigned long ) 1 ) << 1 )
1704+
const CURLAUTH_DIGEST = Culong(1) << 1
17051705

1706-
# Skipping MacroDefinition: CURLAUTH_NEGOTIATE ( ( ( unsigned long ) 1 ) << 2 )
1706+
const CURLAUTH_NEGOTIATE = Culong(1) << 2
17071707

17081708
const CURLAUTH_GSSNEGOTIATE = CURLAUTH_NEGOTIATE
17091709

17101710
const CURLAUTH_GSSAPI = CURLAUTH_NEGOTIATE
17111711

1712-
# Skipping MacroDefinition: CURLAUTH_NTLM ( ( ( unsigned long ) 1 ) << 3 )
1712+
const CURLAUTH_NTLM = Culong(1) << 3
17131713

1714-
# Skipping MacroDefinition: CURLAUTH_DIGEST_IE ( ( ( unsigned long ) 1 ) << 4 )
1714+
const CURLAUTH_DIGEST_IE = Culong(1) << 4
17151715

1716-
# Skipping MacroDefinition: CURLAUTH_NTLM_WB ( ( ( unsigned long ) 1 ) << 5 )
1716+
const CURLAUTH_NTLM_WB = Culong(1) << 5
17171717

1718-
# Skipping MacroDefinition: CURLAUTH_BEARER ( ( ( unsigned long ) 1 ) << 6 )
1718+
const CURLAUTH_BEARER = Culong(1) << 6
17191719

1720-
# Skipping MacroDefinition: CURLAUTH_ONLY ( ( ( unsigned long ) 1 ) << 31 )
1720+
const CURLAUTH_ONLY = Culong(1) << 31
17211721

1722-
# Skipping MacroDefinition: CURLAUTH_ANY ( ~ CURLAUTH_DIGEST_IE )
1722+
const CURLAUTH_ANY = ~CURLAUTH_DIGEST_IE
17231723

1724-
# Skipping MacroDefinition: CURLAUTH_ANYSAFE ( ~ ( CURLAUTH_BASIC | CURLAUTH_DIGEST_IE ) )
1724+
const CURLAUTH_ANYSAFE = ~(CURLAUTH_BASIC | CURLAUTH_DIGEST_IE)
17251725

1726-
# Skipping MacroDefinition: CURLSSH_AUTH_ANY ~ 0
1726+
const CURLSSH_AUTH_ANY = ~0
17271727

17281728
const CURLSSH_AUTH_NONE = 0
17291729

@@ -1847,7 +1847,7 @@ const CURLPROTO_SMBS = 1 << 27
18471847

18481848
const CURLPROTO_MQTT = 1 << 28
18491849

1850-
# Skipping MacroDefinition: CURLPROTO_ALL ( ~ 0 )
1850+
const CURLPROTO_ALL = ~0
18511851

18521852
const CURLOPTTYPE_LONG = 0
18531853

0 commit comments

Comments
 (0)