From b87dfaa2fa6a246bf4743adbf876001a74e82a3a Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 3 Aug 2021 15:00:40 +0100 Subject: [PATCH] tree-wide: voidify unchecked close_nointr calls These have ignored the return value forever. Two are public APIs so we can't really change what they return anyway, and the other one is a cleanup path and the existing error code is more important. CID#1461274 CID#1461275 CID#1461276 --- src/libsystemd/sd-login/sd-login.c | 2 +- src/libsystemd/sd-network/sd-network.c | 2 +- src/login/logind-session-device.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c index 3adf1cef5cf..d127443c4c0 100644 --- a/src/libsystemd/sd-login/sd-login.c +++ b/src/libsystemd/sd-login/sd-login.c @@ -999,7 +999,7 @@ _public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) { _public_ sd_login_monitor* sd_login_monitor_unref(sd_login_monitor *m) { if (m) - close_nointr(MONITOR_TO_FD(m)); + (void) close_nointr(MONITOR_TO_FD(m)); return NULL; } diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c index 7273a77156a..ee93dae9e3a 100644 --- a/src/libsystemd/sd-network/sd-network.c +++ b/src/libsystemd/sd-network/sd-network.c @@ -444,7 +444,7 @@ _public_ int sd_network_monitor_new(sd_network_monitor **m, const char *category _public_ sd_network_monitor* sd_network_monitor_unref(sd_network_monitor *m) { if (m) - close_nointr(MONITOR_TO_FD(m)); + (void) close_nointr(MONITOR_TO_FD(m)); return NULL; } diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c index f2adb969d4e..1c4d543889e 100644 --- a/src/login/logind-session-device.c +++ b/src/login/logind-session-device.c @@ -141,7 +141,7 @@ static int session_device_open(SessionDevice *sd, bool active) { * that so fail at all times and let caller retry in inactive state. */ r = sd_drmsetmaster(fd); if (r < 0) { - close_nointr(fd); + (void) close_nointr(fd); return r; } } else -- 2.47.3