Adjust style a bit.

shkhln · Jun 2, 2024 · 2e093b2 · 2e093b2
1 parent 0601cef
commit 2e093b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/libc/fcntl.c b/src/libc/fcntl.c
@@ -70,6 +70,9 @@ int shim_fcntl_impl(int fd, int cmd, va_list args) {
   if (cmd == LINUX_F_GETFL) {
     LOG("%s: cmd = F_GETFL", __func__);
     int flags       = libepoll_epoll_shim_fcntl(fd, F_GETFL);
+
+    assert((flags & ~(O_RDWR | O_NONBLOCK)) == 0);
+
     int linux_flags =
       (flags & O_RDWR     ? LINUX_O_RDWR     : 0) |
       (flags & O_NONBLOCK ? LINUX_O_NONBLOCK : 0);
@@ -81,7 +84,7 @@ int shim_fcntl_impl(int fd, int cmd, va_list args) {
     int linux_flags = va_arg(args, int);
     LOG("%s: cmd = F_SETFL, arg = 0x%x", __func__, linux_flags);
 
-    assert((linux_flags & (LINUX_O_RDWR | LINUX_O_NONBLOCK)) == linux_flags);
+    assert((linux_flags & ~(LINUX_O_RDWR | LINUX_O_NONBLOCK)) == 0);
 
     int flags =
       (linux_flags & LINUX_O_RDWR     ? O_RDWR     : 0) |

diff --git a/src/libc/sys/eventfd.c b/src/libc/sys/eventfd.c
@@ -11,8 +11,8 @@ int shim_eventfd_impl(unsigned int initval, int linux_flags) {
   assert((linux_flags & ~(LINUX_EFD_CLOEXEC | LINUX_EFD_NONBLOCK)) == 0);
 
   int flags = 0;
-  if (linux_flags & LINUX_EFD_NONBLOCK) flags |= O_NONBLOCK;
-  if (linux_flags & LINUX_EFD_CLOEXEC)  flags |= O_CLOEXEC;
+  if (linux_flags & LINUX_EFD_NONBLOCK) flags |= EFD_NONBLOCK;
+  if (linux_flags & LINUX_EFD_CLOEXEC)  flags |= EFD_CLOEXEC;
 
   return eventfd(initval, flags);
 }