tree-wide: do not work in assert() (#7271)

Fixes #7270.

diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
index df2bdc806ce97645bb825d3563d591feb843eeca..0c9b2d36b000c78295e70adb13943228bcae4ca7 100644 (file)
--- a/src/libsystemd/sd-bus/bus-objects.c
+++ b/src/libsystemd/sd-bus/bus-objects.c
@@ -1498,7 +1498,7 @@ void bus_node_gc(sd_bus *b, struct node *n) {
             n->object_managers)
                 return;
 
-        assert(hashmap_remove(b->nodes, n->path) == n);
+        assert_se(hashmap_remove(b->nodes, n->path) == n);
 
         if (n->parent)
                 LIST_REMOVE(siblings, n->parent->child, n);

diff --git a/src/test/test-bpf.c b/src/test/test-bpf.c
index ec8e00b070b9d7887e0f022ec99d904e20e0d5c1..e2974cd9e430e427f524b1109db3795e97b2363b 100644 (file)
--- a/src/test/test-bpf.c
+++ b/src/test/test-bpf.c
@@ -150,7 +150,7 @@ int main(int argc, char *argv[]) {
 
         assert(r >= 0);
 
-        assert(unit_start(u) >= 0);
+        assert_se(unit_start(u) >= 0);
 
         while (!IN_SET(SERVICE(u)->state, SERVICE_DEAD, SERVICE_FAILED))
                 assert_se(sd_event_run(m->event, UINT64_MAX) >= 0);

diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c
index 873a7fdd6c5d84f7f2098c38fe83830583a61881..a5871a25b061636dbcdde043e49c4a7f6625d5d0 100644 (file)
--- a/src/test/test-fs-util.c
+++ b/src/test/test-fs-util.c
@@ -270,9 +270,9 @@ static void test_var_tmp(void) {
                 assert_se(tmp_backup);
         }
 
-        assert(unsetenv("TMPDIR") >= 0);
-        assert(unsetenv("TEMP") >= 0);
-        assert(unsetenv("TMP") >= 0);
+        assert_se(unsetenv("TMPDIR") >= 0);
+        assert_se(unsetenv("TEMP") >= 0);
+        assert_se(unsetenv("TMP") >= 0);
 
         assert_se(var_tmp_dir(&tmp_dir) >= 0);
         assert_se(streq(tmp_dir, "/var/tmp"));

diff --git a/src/test/test-mount-util.c b/src/test/test-mount-util.c
index 7c5929d009987b3e9f086ff1429dcd5473457a9b..ce5e3dc8cddd2b9817fc5edb77ce0a6b876cfbda 100644 (file)
--- a/src/test/test-mount-util.c
+++ b/src/test/test-mount-util.c
@@ -26,7 +26,7 @@
 static void test_mount_propagation_flags(const char *name, int ret, unsigned long expected) {
         long unsigned flags;
 
-        assert(mount_propagation_flags_from_string(name, &flags) == ret);
+        assert_se(mount_propagation_flags_from_string(name, &flags) == ret);
 
         if (ret >= 0) {
                 const char *c;