Skip to content

Commit 535a9b1

Browse files
committed
Mark ccall to git_libgit2_opts as variadic
1 parent 996dd55 commit 535a9b1

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

stdlib/LibGit2/src/LibGit2.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,8 +1003,10 @@ function set_ssl_cert_locations(cert_loc)
10031003
else # files, /dev/null, non-existent paths, etc.
10041004
cert_file = cert_loc
10051005
end
1006-
ret = ccall((:git_libgit2_opts, :libgit2), Cint, (Cint, Cstring...),
1007-
Cint(Consts.SET_SSL_CERT_LOCATIONS), cert_file, cert_dir)
1006+
ret = @ccall "libgit2".git_libgit2_opts(
1007+
Consts.SET_SSL_CERT_LOCATIONS::Cint;
1008+
cert_file::Cstring,
1009+
cert_dir::Cstring)::Cint
10081010
ret >= 0 && return ret
10091011
err = Error.GitError(ret)
10101012
err.class == Error.SSL &&

stdlib/LibGit2/test/libgit2.jl

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,18 +124,21 @@ end
124124

125125
function get_global_dir()
126126
buf = Ref(LibGit2.Buffer())
127-
LibGit2.@check ccall((:git_libgit2_opts, :libgit2), Cint,
128-
(Cint, Cint, Ptr{LibGit2.Buffer}),
129-
LibGit2.Consts.GET_SEARCH_PATH, LibGit2.Consts.CONFIG_LEVEL_GLOBAL, buf)
127+
128+
LibGit2.@check @ccall "libgit2".git_libgit2_opts(
129+
LibGit2.Consts.GET_SEARCH_PATH::Cint;
130+
LibGit2.Consts.CONFIG_LEVEL_GLOBAL::Cint,
131+
buf::Ptr{LibGit2.Buffer})::Cint
130132
path = unsafe_string(buf[].ptr)
131133
LibGit2.free(buf)
132134
return path
133135
end
134136

135137
function set_global_dir(dir)
136-
LibGit2.@check ccall((:git_libgit2_opts, :libgit2), Cint,
137-
(Cint, Cint, Cstring),
138-
LibGit2.Consts.SET_SEARCH_PATH, LibGit2.Consts.CONFIG_LEVEL_GLOBAL, dir)
138+
LibGit2.@check @ccall "libgit2".git_libgit2_opts(
139+
LibGit2.Consts.SET_SEARCH_PATH::Cint;
140+
LibGit2.Consts.CONFIG_LEVEL_GLOBAL::Cint,
141+
dir::Cstring)::Cint
139142
return
140143
end
141144

0 commit comments

Comments
 (0)