diff --git a/lib/std/Io.zig b/lib/std/Io.zig index b408b847ff34e1c70007d7528581b33895e216b5..ec6afd24f9553e853a1eee5897b6b0f5dd363ff2 100644 --- a/lib/std/Io.zig +++ b/lib/std/Io.zig @@ -238,7 +238,7 @@ pub const VTable = struct { netSend: *const fn (?*anyopaque, net.Socket.Handle, []net.OutgoingMessage, net.SendFlags) struct { ?net.Socket.SendError, usize }, netWrite: *const fn (?*anyopaque, dest: net.Socket.Handle, header: []const u8, data: []const []const u8, splat: usize) net.Stream.Writer.Error!usize, netWriteFile: *const fn (?*anyopaque, net.Socket.Handle, header: []const u8, *Io.File.Reader, Io.Limit) net.Stream.Writer.WriteFileError!usize, - netClose: *const fn (?*anyopaque, handle: []const net.Socket.Handle) void, + netClose: *const fn (?*anyopaque, sockets: []const net.Socket) void, netShutdown: *const fn (?*anyopaque, handle: net.Socket.Handle, how: net.ShutdownHow) net.ShutdownError!void, netInterfaceNameResolve: *const fn (?*anyopaque, *const net.Interface.Name) net.Interface.Name.ResolveError!net.Interface, netInterfaceName: *const fn (?*anyopaque, net.Interface) net.Interface.NameError!net.Interface.Name, @@ -3482,9 +3482,9 @@ pub fn failingNetWriteFile(userdata: ?*anyopaque, handle: net.Socket.Handle, hea return error.NetworkDown; } -pub fn unreachableNetClose(userdata: ?*anyopaque, handle: []const net.Socket.Handle) void { +pub fn unreachableNetClose(userdata: ?*anyopaque, sockets: []const net.Socket) void { _ = userdata; - _ = handle; + _ = sockets; unreachable; } diff --git a/lib/std/Io/Dispatch.zig b/lib/std/Io/Dispatch.zig index e8595f3cbdbf24f5acfa642f3cd9ceb698a122c2..e342a0a9f9606bfd6a8dff6cc17e900fba8d2129 100644 --- a/lib/std/Io/Dispatch.zig +++ b/lib/std/Io/Dispatch.zig @@ -4912,10 +4912,10 @@ fn netWriteFileUnavailable( return error.Unimplemented; } -fn netClose(userdata: ?*anyopaque, handles: []const net.Socket.Handle) void { +fn netClose(userdata: ?*anyopaque, sockets: []const net.Socket) void { const ev: *Evented = @ptrCast(@alignCast(userdata)); _ = ev; - for (handles) |handle| closeFd(handle); + for (sockets) |socket| closeFd(socket.handle); } fn netShutdownUnavailable( diff --git a/lib/std/Io/Kqueue.zig b/lib/std/Io/Kqueue.zig index ce339f029f3a9bab3627154658bd53b6af5c14f2..ea8cbb6cad024be2fe987cc3296bd3e70006aab9 100644 --- a/lib/std/Io/Kqueue.zig +++ b/lib/std/Io/Kqueue.zig @@ -1280,10 +1280,10 @@ fn netWrite(userdata: ?*anyopaque, dest: net.Socket.Handle, header: []const u8, @panic("TODO"); } -fn netClose(userdata: ?*anyopaque, handles: []const net.Socket.Handle) void { +fn netClose(userdata: ?*anyopaque, sockets: []const net.Socket) void { const k: *Kqueue = @ptrCast(@alignCast(userdata)); _ = k; - _ = handles; + _ = sockets; @panic("TODO"); } diff --git a/lib/std/Io/Threaded.zig b/lib/std/Io/Threaded.zig index 715356e8d131ee9c552f1caa70e92c426b9592e7..7a4e2640376345437afa5721b83f8ddb0d99453f 100644 --- a/lib/std/Io/Threaded.zig +++ b/lib/std/Io/Threaded.zig @@ -13415,13 +13415,13 @@ fn addBuf(v: []posix.iovec_const, i: *iovlen_t, bytes: []const u8) void { i.* += 1; } -fn netClose(userdata: ?*anyopaque, handles: []const net.Socket.Handle) void { +fn netClose(userdata: ?*anyopaque, sockets: []const net.Socket) void { if (!have_networking) unreachable; const t: *Threaded = @ptrCast(@alignCast(userdata)); _ = t; - for (handles) |handle| switch (native_os) { - .windows => windows.CloseHandle(handle), - else => closeFd(handle), + for (sockets) |socket| switch (native_os) { + .windows => windows.CloseHandle(socket.handle), + else => closeFd(socket.handle), }; } diff --git a/lib/std/Io/Uring.zig b/lib/std/Io/Uring.zig index d59b2d45b461b03eafaa4ae188bb50819b2a9a2d..86f5bee4bf69329a21257fe6be0946fb0eb28153 100644 --- a/lib/std/Io/Uring.zig +++ b/lib/std/Io/Uring.zig @@ -5189,9 +5189,9 @@ fn netWriteFileUnavailable( return error.Unimplemented; } -fn netClose(userdata: ?*anyopaque, handles: []const net.Socket.Handle) void { +fn netClose(userdata: ?*anyopaque, sockets: []const net.Socket) void { const ev: *Evented = @ptrCast(@alignCast(userdata)); - for (handles) |handle| ev.close(handle); + for (sockets) |sock| ev.close(sock.handle); } fn netShutdown( diff --git a/lib/std/Io/net.zig b/lib/std/Io/net.zig index 9c2e3d3a693c0cd1f5af53ee610c2a64e36ad4b3..c778dcde66f4b773a3d3f95f698c628eacb3f5f1 100644 --- a/lib/std/Io/net.zig +++ b/lib/std/Io/net.zig @@ -1081,7 +1081,7 @@ pub const Socket = struct { /// Leaves `address` in a valid state. pub fn close(s: *const Socket, io: Io) void { - io.vtable.netClose(io.userdata, (&s.handle)[0..1]); + io.vtable.netClose(io.userdata, s[0..1]); } pub fn closeMany(io: Io, sockets: []const Socket) void { @@ -1258,7 +1258,7 @@ pub const Stream = struct { } pub fn close(s: *const Stream, io: Io) void { - io.vtable.netClose(io.userdata, (&s.socket.handle)[0..1]); + io.vtable.netClose(io.userdata, (&s.socket)[0..1]); } pub fn shutdown(s: *const Stream, io: Io, how: ShutdownHow) ShutdownError!void {