Commit f58ee387c7c9a512d802f819f870190c900cb6e2 | zig

author	mochalins <117967760+mochalins@users.noreply.github.com> 2024-06-23 14:23:53+09:00
committer	Andrew Kelley <andrew@ziglang.org> 2024-07-10 01:35:01-04:00
log	f58ee387c7c9a512d802f819f870190c900cb6e2
tree	92c67da89fac5471818637ed98a9133698fbc1b2
parent	9363e995fcf49a9496523c857fa925539fc7c2d6

fix: Use `std.os.windows.poll` rather than `libc`

1 files changed, 20 insertions(+), 22 deletions(-)

lib
- std
  - posix.zig

lib/std/posix.zig+20-22

 @@ -6479,33 +6479,31 @@ pub const PollError = error{
 } || UnexpectedError;
 pub fn poll(fds: []pollfd, timeout: i32) PollError!usize {
+    if (native_os == .windows) {
+        switch (windows.poll(fds.ptr, @intCast(fds.len), timeout)) {
+            windows.ws2_32.SOCKET_ERROR => switch (windows.ws2_32.WSAGetLastError()) {
+                .WSANOTINITIALISED => unreachable,
+                .WSAENETDOWN => return error.NetworkSubsystemFailed,
+                .WSAENOBUFS => return error.SystemResources,
+                // TODO: handle more errors
+                else => |err| return windows.unexpectedWSAError(err),
+            },
+            else => |rc| return @intCast(rc),
+        }
+    }
     while (true) {
         const fds_count = cast(nfds_t, fds.len) orelse return error.SystemResources;
         const rc = system.poll(fds.ptr, fds_count, timeout);
-        if (native_os == .windows) {
+        switch (errno(rc)) {
-            if (rc == windows.ws2_32.SOCKET_ERROR) {
+            .SUCCESS => return @intCast(rc),
-                switch (windows.ws2_32.WSAGetLastError()) {
+            .FAULT => unreachable,
-                    .WSANOTINITIALISED => unreachable,
+            .INTR => continue,
-                    .WSAENETDOWN => return error.NetworkSubsystemFailed,
+            .INVAL => unreachable,
-                    .WSAENOBUFS => return error.SystemResources,
+            .NOMEM => return error.SystemResources,
-                    // TODO: handle more errors
+            else => |err| return unexpectedErrno(err),
-                    else => |err| return windows.unexpectedWSAError(err),
-                }
-            } else {
-                return @intCast(rc);
-            }
-        } else {
-            switch (errno(rc)) {
-                .SUCCESS => return @intCast(rc),
-                .FAULT => unreachable,
-                .INTR => continue,
-                .INVAL => unreachable,
-                .NOMEM => return error.SystemResources,
-                else => |err| return unexpectedErrno(err),
-            }
         }
-        unreachable;
     }
+    unreachable;
 }
 pub const PPollError = error{