Skip to content

Lightpanda: the headless browser designed for AI and automation

`libcurl`: reintroduce `Curl*` prefix for function pointer types

Halil Durakca1b625d51d0
diff --git a/src/network/http.zig b/src/network/http.zig
index 337df8711..8baeaf24a 100644
--- a/src/network/http.zig
+++ b/src/network/http.zig
@@ -328,12 +328,12 @@ pub const ResponseHead = struct {
/// Returns CURL_SOCKET_BAD to block; otherwise creates and returns a real socket fd.
/// clientp is a *const IpFilter passed via CURLOPT_OPENSOCKETDATA.
fn opensocketCallback(
- raw_ip_filter: ?*anyopaque,
+ clientp: ?*anyopaque,
_: c_uint,
addr: [*c]libcurl.CurlSockAddr,
) callconv(.c) libcurl.CurlSocket {
const address: *libcurl.CurlSockAddr = @ptrCast(addr);
- const filter: *const IpFilter = @ptrCast(@alignCast(raw_ip_filter orelse return libcurl.CURL_SOCKET_BAD));
+ const filter: *const IpFilter = @ptrCast(@alignCast(clientp orelse return libcurl.CURL_SOCKET_BAD));
if (filter.isBlockedSockaddr(address)) {
if (address.family == posix.AF.INET or address.family == posix.AF.INET6) {
@@ -466,7 +466,7 @@ pub const Connection = struct {
pub fn setWriteCallback(
self: *Connection,
- comptime data_cb: libcurl.WriteFunction,
+ comptime data_cb: libcurl.CurlWriteFunction,
) !void {
try libcurl.curl_easy_setopt(self._easy, .write_data, self);
try libcurl.curl_easy_setopt(self._easy, .write_function, data_cb);
@@ -474,7 +474,7 @@ pub const Connection = struct {
pub fn setReadCallback(
self: *Connection,
- comptime data_cb: libcurl.ReadFunction,
+ comptime data_cb: libcurl.CurlReadFunction,
upload: bool,
) !void {
try libcurl.curl_easy_setopt(self._easy, .read_data, self);
@@ -486,7 +486,7 @@ pub const Connection = struct {
pub fn setHeaderCallback(
self: *Connection,
- comptime data_cb: libcurl.HeaderFunction,
+ comptime data_cb: libcurl.CurlHeaderFunction,
) !void {
try libcurl.curl_easy_setopt(self._easy, .header_data, self);
try libcurl.curl_easy_setopt(self._easy, .header_function, data_cb);
@@ -762,7 +762,7 @@ pub const Handles = struct {
}
};
-fn debugCallback(_: *libcurl.Curl, msg_type: libcurl.CurlInfoType, raw: [*c]u8, len: usize, _: *anyopaque) c_int {
+fn debugCallback(_: *libcurl.Curl, msg_type: libcurl.CurlInfoType, raw: [*c]u8, len: usize, _: ?*anyopaque) callconv(.c) c_int {
const data = raw[0..len];
switch (msg_type) {
.text => std.debug.print("libcurl [text]: {s}\n", .{data}),
diff --git a/src/sys/libcurl.zig b/src/sys/libcurl.zig
index 4924b994f..e473d5896 100644
--- a/src/sys/libcurl.zig
+++ b/src/sys/libcurl.zig
@@ -41,14 +41,14 @@ pub const CURLE = struct {
pub const ABORTED_BY_CALLBACK = c.CURLE_ABORTED_BY_CALLBACK;
};
-pub const HeaderFunction = *const fn ([*]const u8, usize, usize, *anyopaque) callconv(.c) usize;
-pub const WriteFunction = *const fn ([*]const u8, usize, usize, *anyopaque) callconv(.c) usize;
+pub const CurlHeaderFunction = *const fn ([*]const u8, usize, usize, *anyopaque) callconv(.c) usize;
+pub const CurlWriteFunction = *const fn ([*]const u8, usize, usize, *anyopaque) callconv(.c) usize;
pub const curl_writefunc_error: usize = c.CURL_WRITEFUNC_ERROR;
pub const curl_readfunc_pause: usize = c.CURL_READFUNC_PAUSE;
-pub const ReadFunction = *const fn ([*]u8, usize, usize, *anyopaque) callconv(.c) usize;
-pub const OpenSocketFunction = *const fn (?*anyopaque, c_uint, [*c]CurlSockAddr) callconv(.c) CurlSocket;
-pub const SslCtxFunction = *const fn (*Curl, *anyopaque, *anyopaque) callconv(.c) CurlCode;
-pub const DebugFunction = *const fn (*Curl, CurlInfoType, [*c]u8, usize, ?*anyopaque) callconv(.c) c_int;
+pub const CurlReadFunction = *const fn ([*]u8, usize, usize, *anyopaque) callconv(.c) usize;
+pub const CurlOpenSocketFunction = *const fn (?*anyopaque, c_uint, [*c]CurlSockAddr) callconv(.c) CurlSocket;
+pub const CurlSslCtxFunction = *const fn (*Curl, *anyopaque, *anyopaque) callconv(.c) CurlCode;
+pub const CurlDebugFunction = *const fn (*Curl, CurlInfoType, [*c]u8, usize, ?*anyopaque) callconv(.c) c_int;
pub const CurlSockType = enum(c.curlsocktype) {
ipcxn = c.CURLSOCKTYPE_IPCXN,
@@ -635,12 +635,12 @@ pub fn curl_easy_setopt(easy: *Curl, comptime option: CurlOption, value: anytype
.ssl_ctx_data => @as(*crypto.X509_STORE, value),
- .debug_function => @as(DebugFunction, value),
- .opensocket_function => @as(OpenSocketFunction, value),
- .header_function => @as(HeaderFunction, value),
- .read_function => @as(ReadFunction, value),
- .write_function => @as(WriteFunction, value),
- .ssl_ctx_function => @as(SslCtxFunction, value),
+ .debug_function => @as(CurlDebugFunction, value),
+ .opensocket_function => @as(CurlOpenSocketFunction, value),
+ .header_function => @as(CurlHeaderFunction, value),
+ .read_function => @as(CurlReadFunction, value),
+ .write_function => @as(CurlWriteFunction, value),
+ .ssl_ctx_function => @as(CurlSslCtxFunction, value),
};
const code = c.curl_easy_setopt(easy, @intFromEnum(option), v);
return errorCheck(code);