diff options
| author | David Tardon <dtardon@redhat.com> | 2022-08-09 14:35:15 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2022-09-13 08:13:27 +0200 |
| commit | 995340074e554b4bf4a0fdb0cb7436692c5a4ffd (patch) | |
| tree | ca3ee001db3e608ee80478f42fea9c3b409f1b7b /src/journal/journald-stream.c | |
| parent | 6d64cb0625691e2b9eda8babe07ac8281f9467ee (diff) | |
| download | systemd-995340074e554b4bf4a0fdb0cb7436692c5a4ffd.tar.gz | |
tree-wide: use ASSERT_PTR more
Diffstat (limited to 'src/journal/journald-stream.c')
| -rw-r--r-- | src/journal/journald-stream.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c index 19f0799914..8bdcd8c2ae 100644 --- a/src/journal/journald-stream.c +++ b/src/journal/journald-stream.c @@ -548,7 +548,7 @@ static int stdout_stream_scan( static int stdout_stream_process(sd_event_source *es, int fd, uint32_t revents, void *userdata) { CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(struct ucred))) control; size_t limit, consumed, allocated; - StdoutStream *s = userdata; + StdoutStream *s = ASSERT_PTR(userdata); struct ucred *ucred; struct iovec iovec; ssize_t l; @@ -562,8 +562,6 @@ static int stdout_stream_process(sd_event_source *es, int fd, uint32_t revents, .msg_controllen = sizeof(control), }; - assert(s); - if ((revents|EPOLLIN|EPOLLHUP) != (EPOLLIN|EPOLLHUP)) { log_error("Got invalid event from epoll for stdout stream: %"PRIx32, revents); goto terminate; @@ -705,11 +703,9 @@ int stdout_stream_install(Server *s, int fd, StdoutStream **ret) { static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revents, void *userdata) { _cleanup_close_ int fd = -1; - Server *s = userdata; + Server *s = ASSERT_PTR(userdata); int r; - assert(s); - if (revents != EPOLLIN) return log_error_errno(SYNTHETIC_ERRNO(EIO), "Got invalid event from epoll for stdout server fd: %" PRIx32, |