diff options
| author | Zijun Zhao <zijunzhao@google.com> | 2023-04-20 21:08:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-20 21:08:23 +0000 |
| commit | c64b201456450f8c62569dc4c3adb339006fada3 (patch) | |
| tree | 1b396d511f10dda22926570204d632f50728d4d5 | |
| parent | ad5573a42c32d98255de7bc675119861049ceffb (diff) | |
| parent | 3ce75e1f66a6e28d914343e04f940320dbf01273 (diff) | |
| download | bionic-c64b201456450f8c62569dc4c3adb339006fada3.tar.gz | |
Merge "Nullability check for select module." am: e2abfb3ddf am: ed3fc73ad1 am: df11a31153 am: 3ce75e1f66
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2550050
Change-Id: I3e89c8c37eea3d5fb88404fb149cbad241d32965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libc/include/sys/select.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libc/include/sys/select.h b/libc/include/sys/select.h index 06914a66a..8c6c2ff41 100644 --- a/libc/include/sys/select.h +++ b/libc/include/sys/select.h @@ -71,9 +71,9 @@ typedef struct { } \ } while (0) -void __FD_CLR_chk(int, fd_set*, size_t) __INTRODUCED_IN(21); -void __FD_SET_chk(int, fd_set*, size_t) __INTRODUCED_IN(21); -int __FD_ISSET_chk(int, const fd_set*, size_t) __INTRODUCED_IN(21); +void __FD_CLR_chk(int, fd_set* _Nonnull , size_t) __INTRODUCED_IN(21); +void __FD_SET_chk(int, fd_set* _Nonnull, size_t) __INTRODUCED_IN(21); +int __FD_ISSET_chk(int, const fd_set* _Nonnull, size_t) __INTRODUCED_IN(21); #define __FD_CLR(fd, set) (__FDS_BITS(fd_set*,set)[__FDELT(fd)] &= ~__FDMASK(fd)) #define __FD_SET(fd, set) (__FDS_BITS(fd_set*,set)[__FDELT(fd)] |= __FDMASK(fd)) @@ -95,7 +95,7 @@ int __FD_ISSET_chk(int, const fd_set*, size_t) __INTRODUCED_IN(21); * Returns the number of ready file descriptors on success, 0 for timeout, * and returns -1 and sets `errno` on failure. */ -int select(int __max_fd_plus_one, fd_set* __read_fds, fd_set* __write_fds, fd_set* __exception_fds, struct timeval* __timeout); +int select(int __max_fd_plus_one, fd_set* _Nullable __read_fds, fd_set* _Nullable __write_fds, fd_set* _Nullable __exception_fds, struct timeval* _Nullable __timeout); /** * [pselect(2)](http://man7.org/linux/man-pages/man2/select.2.html) waits on a @@ -106,7 +106,7 @@ int select(int __max_fd_plus_one, fd_set* __read_fds, fd_set* __write_fds, fd_se * Returns the number of ready file descriptors on success, 0 for timeout, * and returns -1 and sets `errno` on failure. */ -int pselect(int __max_fd_plus_one, fd_set* __read_fds, fd_set* __write_fds, fd_set* __exception_fds, const struct timespec* __timeout, const sigset_t* __mask); +int pselect(int __max_fd_plus_one, fd_set* _Nullable __read_fds, fd_set* _Nullable __write_fds, fd_set* _Nullable __exception_fds, const struct timespec* _Nullable __timeout, const sigset_t* _Nullable __mask); /** * [pselect64(2)](http://man7.org/linux/man-pages/man2/select.2.html) waits on a @@ -119,6 +119,6 @@ int pselect(int __max_fd_plus_one, fd_set* __read_fds, fd_set* __write_fds, fd_s * * Available since API level 28. */ -int pselect64(int __max_fd_plus_one, fd_set* __read_fds, fd_set* __write_fds, fd_set* __exception_fds, const struct timespec* __timeout, const sigset64_t* __mask) __INTRODUCED_IN(28); +int pselect64(int __max_fd_plus_one, fd_set* _Nullable __read_fds, fd_set* _Nullable __write_fds, fd_set* _Nullable __exception_fds, const struct timespec* _Nullable __timeout, const sigset64_t* _Nullable __mask) __INTRODUCED_IN(28); __END_DECLS |