From bfd9bfccceed07da65b3546ca47e7a53b7bf680a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 31 Mar 2021 14:06:39 +0200 Subject: [PATCH] sd-event: silence gcc's maybe-unitialized warning MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit [91/180] Compiling C object libsystemd.a.p/src_libsystemd_sd-event_sd-event.c.o In file included from ../src/basic/macro.h:12, from ../src/basic/alloc-util.h:9, from ../src/libsystemd/sd-event/sd-event.c:11: ../src/libsystemd/sd-event/sd-event.c: In function ‘sd_event_wait’: ../src/fundamental/macro-fundamental.h:86:63: warning: ‘child_min_priority’ may be used uninitialized in this function [-Wmaybe-uninitialized] 86 | UNIQ_T(A, aq) < UNIQ_T(B, bq) ? UNIQ_T(A, aq) : UNIQ_T(B, bq); \ | ^ ../src/libsystemd/sd-event/sd-event.c:3983:45: note: ‘child_min_priority’ was declared here 3983 | int64_t epoll_min_priority, child_min_priority; | ^~~~~~~~~~~~~~~~~~ Alternative to #19159. --- src/libsystemd/sd-event/sd-event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index b76b0623fe3..172be4e07e8 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -3171,7 +3171,7 @@ static int process_child(sd_event *e, int64_t threshold, int64_t *ret_min_priori zero(s->child.siginfo); if (waitid(P_PID, s->child.pid, &s->child.siginfo, WNOHANG | (s->child.options & WEXITED ? WNOWAIT : 0) | s->child.options) < 0) - return -errno; + return negative_errno(); if (s->child.siginfo.si_pid != 0) { bool zombie = IN_SET(s->child.siginfo.si_code, CLD_EXITED, CLD_KILLED, CLD_DUMPED); -- 2.47.3