chiark / gitweb /
tree-wide: do not work in assert() (#7271)
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 7 Nov 2017 13:04:20 +0000 (22:04 +0900)
committerSven Eden <yamakuzure@gmx.net>
Tue, 7 Nov 2017 13:04:20 +0000 (22:04 +0900)
Fixes #7270.

src/libelogind/sd-bus/bus-objects.c
src/test/test-fs-util.c

index df2bdc806ce97645bb825d3563d591feb843eeca..0c9b2d36b000c78295e70adb13943228bcae4ca7 100644 (file)
@@ -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);
index 6620592e4b5df4b29abbe6abf154797b01ff8f47..467a7cb9dd788578d967249cb01256d77e60583f 100644 (file)
@@ -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"));