diff --git a/src/browser/HttpClient.zig b/src/browser/HttpClient.zig index b64c55f89..06e2b22aa 100644 --- a/src/browser/HttpClient.zig +++ b/src/browser/HttpClient.zig @@ -2098,12 +2098,7 @@ pub const Transfer = struct { return result; } - fn dataCallback( - buffer: [*]const u8, - chunk_count: usize, - chunk_len: usize, - data: *anyopaque, - ) callconv(.c) usize { + fn dataCallback(buffer: [*]const u8, chunk_count: usize, chunk_len: usize, data: *anyopaque) callconv(.c) usize { // libcurl should only ever emit 1 chunk at a time if (comptime IS_DEBUG) { std.debug.assert(chunk_count == 1); diff --git a/src/browser/webapi/net/WebSocket.zig b/src/browser/webapi/net/WebSocket.zig index dd33d99a8..c94ae9235 100644 --- a/src/browser/webapi/net/WebSocket.zig +++ b/src/browser/webapi/net/WebSocket.zig @@ -545,16 +545,11 @@ fn dispatchCloseEvent(self: *WebSocket, code: u16, reason: []const u8, was_clean } } -fn sendDataCallback( - buffer: [*c]u8, - buf_count: usize, - buf_len: usize, - raw_connection: ?*anyopaque, -) callconv(.c) usize { +fn sendDataCallback(buffer: [*]u8, buf_count: usize, buf_len: usize, data: *anyopaque) callconv(.c) usize { if (comptime IS_DEBUG) { std.debug.assert(buf_count == 1); } - const conn: *http.Connection = @ptrCast(@alignCast(raw_connection)); + const conn: *http.Connection = @ptrCast(@alignCast(data)); return _sendDataCallback(conn, buffer[0..buf_len]) catch |err| { log.warn(.websocket, "send callback", .{ .err = err }); return http.readfunc_pause; @@ -629,12 +624,7 @@ fn writeContent(self: *WebSocket, conn: *http.Connection, buf: []u8, byte_msg: M return to_copy; } -fn receivedDataCallback( - buffer: [*]const u8, - buf_count: usize, - buf_len: usize, - data: *anyopaque, -) callconv(.c) usize { +fn receivedDataCallback(buffer: [*]const u8, buf_count: usize, buf_len: usize, data: *anyopaque) callconv(.c) usize { if (comptime IS_DEBUG) { std.debug.assert(buf_count == 1); } @@ -705,12 +695,7 @@ fn _receivedDataCallback(conn: *http.Connection, data: []const u8) !void { // libcurl has no mechanism to signal that the connection is established. The // best option I could come up with was looking for an upgrade header response. -fn receivedHeaderCallback( - buffer: [*]const u8, - header_count: usize, - buf_len: usize, - data: *anyopaque, -) callconv(.c) usize { +fn receivedHeaderCallback(buffer: [*]const u8, header_count: usize, buf_len: usize, data: *anyopaque) callconv(.c) usize { if (comptime IS_DEBUG) { std.debug.assert(header_count == 1); }