libc: change to flattened event struct

Author: pchickey

libc-bottom-half/cloudlibc/src/libc/poll/poll.c

@@ -77,8 +77,8 @@ int poll(struct pollfd *fds, size_t nfds, int timeout) {
   // Set revents fields.
   for (size_t i = 0; i < nevents; ++i) {
     const __wasi_event_t *event = &events[i];
-    if (event->u.tag == __WASI_EVENTTYPE_FD_READ ||
-        event->u.tag == __WASI_EVENTTYPE_FD_WRITE) {
+    if (event->type == __WASI_EVENTTYPE_FD_READ ||
+        event->type == __WASI_EVENTTYPE_FD_WRITE) {
       struct pollfd *pollfd = (struct pollfd *)(uintptr_t)event->userdata;
 #ifdef __wasilibc_unmodified_upstream // generated constant names
       if (event->error == __WASI_EBADF) {
@@ -99,14 +99,14 @@ int poll(struct pollfd *fds, size_t nfds, int timeout) {
         pollfd->revents |= POLLERR;
       } else {
         // Data can be read or written.
-        if (event->u.tag == __WASI_EVENTTYPE_FD_READ) {
+        if (event->type == __WASI_EVENTTYPE_FD_READ) {
             pollfd->revents |= POLLRDNORM;
-            if (event->u.u.fd_read.flags & __WASI_EVENTRWFLAGS_FD_READWRITE_HANGUP) {
+            if (event->fd_readwrite.flags & __WASI_EVENTRWFLAGS_FD_READWRITE_HANGUP) {
               pollfd->revents |= POLLHUP;
             }
-        } else if (event->u.tag == __WASI_EVENTTYPE_FD_WRITE) {
+        } else if (event->type == __WASI_EVENTTYPE_FD_WRITE) {
             pollfd->revents |= POLLWRNORM;
-            if (event->u.u.fd_write.flags & __WASI_EVENTRWFLAGS_FD_READWRITE_HANGUP) {
+            if (event->fd_readwrite.flags & __WASI_EVENTRWFLAGS_FD_READWRITE_HANGUP) {
               pollfd->revents |= POLLHUP;
             }
         }

libc-bottom-half/cloudlibc/src/libc/sys/ioctl/ioctl.c

@@ -48,8 +48,8 @@ int ioctl(int fildes, int request, ...) {
           errno = event->error;
           return -1;
         }
-        if (event->u.tag == __WASI_EVENTTYPE_FD_READ) {
-          *result = event->u.u.fd_read.nbytes;
+        if (event->type == __WASI_EVENTTYPE_FD_READ) {
+          *result = event->fd_readwrite.nbytes;
           return 0;
         }
       }

libc-bottom-half/cloudlibc/src/libc/sys/select/pselect.c

@@ -97,8 +97,8 @@ int pselect(int nfds, fd_set *restrict readfds, fd_set *restrict writefds,
   // Test for EBADF.
   for (size_t i = 0; i < nevents; ++i) {
     const __wasi_event_t *event = &events[i];
-    if ((event->u.tag == __WASI_EVENTTYPE_FD_READ ||
-         event->u.tag == __WASI_EVENTTYPE_FD_WRITE) &&
+    if ((event->type == __WASI_EVENTTYPE_FD_READ ||
+         event->type == __WASI_EVENTTYPE_FD_WRITE) &&
 #ifdef __wasilibc_unmodified_upstream // generated constant names
         event->error == __WASI_EBADF) {
 #else
@@ -114,9 +114,9 @@ int pselect(int nfds, fd_set *restrict readfds, fd_set *restrict writefds,
   FD_ZERO(writefds);
   for (size_t i = 0; i < nevents; ++i) {
     const __wasi_event_t *event = &events[i];
-    if (event->u.tag == __WASI_EVENTTYPE_FD_READ) {
+    if (event->type == __WASI_EVENTTYPE_FD_READ) {
       readfds->__fds[readfds->__nfds++] = event->userdata;
-    } else if (event->u.tag == __WASI_EVENTTYPE_FD_WRITE) {
+    } else if (event->type == __WASI_EVENTTYPE_FD_WRITE) {
       writefds->__fds[writefds->__nfds++] = event->userdata;
     }
   }