From 85e55d14dea66f5fe412ca8128487d5ea828b7b1 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 7 Nov 2017 22:04:20 +0900
Subject: [PATCH] tree-wide: do not work in assert() (#7271)

Fixes #7270.
---
 src/libsystemd/sd-bus/bus-objects.c | 2 +-
 src/test/test-bpf.c                 | 2 +-
 src/test/test-fs-util.c             | 6 +++---
 src/test/test-mount-util.c          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
index df2bdc8..0c9b2d3 100644
--- 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 ec8e00b..e2974cd 100644
--- 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 873a7fd..a5871a2 100644
--- 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 7c5929d..ce5e3dc 100644
--- 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;
-- 
2.7.4