picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Fixes #7270.
This commit is contained in:
Yu Watanabe 2017-11-07 22:04:20 +09:00 committed by Lennart Poettering
parent 0b97f52a33
commit 85e55d14de
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsystemd/sd-bus/bus-objects.c
View 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);

2
src/test/test-bpf.c
View File

@ -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);

6
src/test/test-fs-util.c
View File

@ -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"));

2
src/test/test-mount-util.c
View File

@ -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;