From e3747380fb66228dc4fa7c5815d884f96d873db4 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Sun, 2 Jul 2023 11:04:38 +0200 Subject: [PATCH 1/4] test: drop an unused assignment Unused since 788c2d9523. Resolves: CID#1509248 --- src/test/test-watchdog.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/test-watchdog.c b/src/test/test-watchdog.c index a0b3af2aba..70d069c08b 100644 --- a/src/test/test-watchdog.c +++ b/src/test/test-watchdog.c @@ -23,8 +23,6 @@ int main(int argc, char *argv[]) { r = watchdog_setup(t); if (r < 0) log_warning_errno(r, "Failed to open watchdog: %m"); - if (r == -EPERM) - t = 0; for (i = 0; i < count; i++) { t = watchdog_runtime_wait(); From 9cf7f7a82f5f101cf0cbbf2d511fb030e4fb23ae Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Sun, 2 Jul 2023 11:09:09 +0200 Subject: [PATCH 2/4] virt: drop an unused assignment As `v` gets overwritten by the following detect_vm_cpuid() call. Resolves: CID#1509247 --- src/basic/virt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/basic/virt.c b/src/basic/virt.c index 79fa43e0d8..1fef114bc8 100644 --- a/src/basic/virt.c +++ b/src/basic/virt.c @@ -492,8 +492,6 @@ Virtualization detect_vm(void) { return xen_dom0; if (xen_dom0 == 0) goto finish; - - v = VIRTUALIZATION_NONE; } else if (v != VIRTUALIZATION_NONE) assert_not_reached(); From 85773a7fd0c4917c0141c49453318200b8d56589 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Sun, 2 Jul 2023 11:22:50 +0200 Subject: [PATCH 3/4] unit: drop an unused assignment Resolves: CID#1509244 --- src/core/unit.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/core/unit.c b/src/core/unit.c index 81467093e7..86c636840f 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -2876,9 +2876,7 @@ int unit_watch_pid(Unit *u, pid_t pid, bool exclusive) { if (array[n] == u) found = true; - if (found) /* Found it already? if so, do nothing */ - r = 0; - else { + if (!found) { Unit **new_array; /* Allocate a new array */ From 5000cea8d28d6db378b7c67b5305cc26694c3401 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Sun, 2 Jul 2023 11:39:00 +0200 Subject: [PATCH 4/4] tree-wide: explicitly ignore return value in a couple more places Resolves: - CID#1490777 - CID#1498366 - CID#1508639 - CID#1509084 - CID#1509086 - CID#1509087 --- src/basic/process-util.c | 2 +- src/libsystemd/sd-device/sd-device.c | 2 +- src/libsystemd/sd-journal/test-mmap-cache.c | 6 +++--- src/test/test-execute.c | 2 +- src/test/test-io-util.c | 2 +- src/udev/udev-watch.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/basic/process-util.c b/src/basic/process-util.c index 001002a55e..6cf882866f 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -1095,7 +1095,7 @@ pid_t getpid_cached(void) { * https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c579f48edba88380635ab98cb612030e3ed8691e */ - __atomic_compare_exchange_n( + (void) __atomic_compare_exchange_n( &cached_pid, ¤t_value, CACHED_PID_BUSY, diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index 2c7b97ab4d..af39c984d0 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -1013,7 +1013,7 @@ _public_ sd_device *sd_device_get_child_next(sd_device *device, const char **ret assert(device); - hashmap_iterate(device->children, &device->children_iterator, (void**) &child, (const void**) ret_suffix); + (void) hashmap_iterate(device->children, &device->children_iterator, (void**) &child, (const void**) ret_suffix); return child; } diff --git a/src/libsystemd/sd-journal/test-mmap-cache.c b/src/libsystemd/sd-journal/test-mmap-cache.c index e3dfbada32..bc063381b2 100644 --- a/src/libsystemd/sd-journal/test-mmap-cache.c +++ b/src/libsystemd/sd-journal/test-mmap-cache.c @@ -21,17 +21,17 @@ int main(int argc, char *argv[]) { x = mkostemp_safe(px); assert_se(x >= 0); - unlink(px); + (void) unlink(px); assert_se(fx = mmap_cache_add_fd(m, x, PROT_READ)); y = mkostemp_safe(py); assert_se(y >= 0); - unlink(py); + (void) unlink(py); z = mkostemp_safe(pz); assert_se(z >= 0); - unlink(pz); + (void) unlink(pz); r = mmap_cache_fd_get(fx, 0, false, 1, 2, NULL, &p); assert_se(r >= 0); diff --git a/src/test/test-execute.c b/src/test/test-execute.c index 164c1bc033..27d2af78f3 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -419,7 +419,7 @@ static void test_exec_privatetmp(Manager *m) { test(m, "exec-privatetmp-no.service", 0, CLD_EXITED); test(m, "exec-privatetmp-disabled-by-prefix.service", can_unshare ? 0 : MANAGER_IS_SYSTEM(m) ? EXIT_FAILURE : EXIT_NAMESPACE, CLD_EXITED); - unlink("/tmp/test-exec_privatetmp"); + (void) unlink("/tmp/test-exec_privatetmp"); } static void test_exec_privatedevices(Manager *m) { diff --git a/src/test/test-io-util.c b/src/test/test-io-util.c index fd41a2a4d1..fa3ef865c9 100644 --- a/src/test/test-io-util.c +++ b/src/test/test-io-util.c @@ -37,7 +37,7 @@ TEST(sparse_write) { fd = mkostemp(fn, O_CLOEXEC); assert_se(fd >= 0); - unlink(fn); + (void) unlink(fn); test_sparse_write_one(fd, test_a, sizeof(test_a)); test_sparse_write_one(fd, test_b, sizeof(test_b)); diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c index d00226cd7a..58c82794f0 100644 --- a/src/udev/udev-watch.c +++ b/src/udev/udev-watch.c @@ -51,7 +51,7 @@ int udev_watch_restore(int inotify_fd) { assert(inotify_fd >= 0); - rm_rf("/run/udev/watch.old", REMOVE_ROOT); + (void) rm_rf("/run/udev/watch.old", REMOVE_ROOT); if (rename("/run/udev/watch", "/run/udev/watch.old") < 0) { if (errno == ENOENT)