From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 7 Nov 2017 13:04:20 +0000 (+0900)
Subject: tree-wide: do not work in assert() (#7271)
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6db8722a7f5ffc943ab2bb96aa1afd5914d810f1;p=elogind.git

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

Fixes #7270.
---

diff --git a/src/libelogind/sd-bus/bus-objects.c b/src/libelogind/sd-bus/bus-objects.c
index df2bdc806..0c9b2d36b 100644
--- a/src/libelogind/sd-bus/bus-objects.c
+++ b/src/libelogind/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-fs-util.c b/src/test/test-fs-util.c
index 6620592e4..467a7cb9d 100644
--- a/src/test/test-fs-util.c
+++ b/src/test/test-fs-util.c
@@ -271,9 +271,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"));