morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

io-util: rename 'nfds' -> 'n_fds'

Browse Source
This commit is contained in:
Jelle van der Waa
2025-06-02 17:42:08 +02:00
parent 8821a312a8
commit fa6f4484e8
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/basic/io-util.c
View File

@@ -188,10 +188,10 @@ int pipe_eof(int fd) {
return !!(r & POLLHUP);
}
int ppoll_usec_full(struct pollfd *fds, size_t nfds, usec_t timeout, const sigset_t *ss) {
int ppoll_usec_full(struct pollfd *fds, size_t n_fds, usec_t timeout, const sigset_t *ss) {
int r;
assert(fds || nfds == 0);
assert(fds || n_fds == 0);
/* This is a wrapper around ppoll() that does primarily two things:
*
@@ -208,16 +208,16 @@ int ppoll_usec_full(struct pollfd *fds, size_t nfds, usec_t timeout, const sigse
* to handle signals, such as signalfd() or signal handlers. ⚠️ ⚠️ ⚠️
*/
if (nfds == 0 && timeout == 0)
if (n_fds == 0 && timeout == 0)
return 0;
r = ppoll(fds, nfds, timeout == USEC_INFINITY ? NULL : TIMESPEC_STORE(timeout), ss);
r = ppoll(fds, n_fds, timeout == USEC_INFINITY ? NULL : TIMESPEC_STORE(timeout), ss);
if (r < 0)
return -errno;
if (r == 0)
return 0;
for (size_t i = 0, n = r; i < nfds && n > 0; i++) {
for (size_t i = 0, n = r; i < n_fds && n > 0; i++) {
if (fds[i].revents == 0)
continue;
if (fds[i].revents & POLLNVAL)

6
src/basic/io-util.h
View File

@@ -15,9 +15,9 @@ static inline int loop_write(int fd, const void *buf, size_t nbytes) {
int pipe_eof(int fd);
int ppoll_usec_full(struct pollfd *fds, size_t nfds, usec_t timeout, const sigset_t *ss) _nonnull_if_nonzero_(1, 2);
_nonnull_if_nonzero_(1, 2) static inline int ppoll_usec(struct pollfd *fds, size_t nfds, usec_t timeout) {
return ppoll_usec_full(fds, nfds, timeout, NULL);
int ppoll_usec_full(struct pollfd *fds, size_t n_fds, usec_t timeout, const sigset_t *ss) _nonnull_if_nonzero_(1, 2);
_nonnull_if_nonzero_(1, 2) static inline int ppoll_usec(struct pollfd *fds, size_t n_fds, usec_t timeout) {
return ppoll_usec_full(fds, n_fds, timeout, NULL);
}
int fd_wait_for_event(int fd, int event, usec_t timeout);

2
src/basic/terminal-util.c
View File

@@ -735,7 +735,7 @@ int acquire_terminal(
.fd = notify,
.events = POLLIN,
},
/* n_pollfds = */ 1,
/* n_fds = */ 1,
left,
&poll_ss);
if (r < 0)