diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-08-06 16:48:17 +0300 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-08-06 16:54:00 +0300 |
| commit | 491ac9f2c4aeda8c40edde35112404b737e38b60 (patch) | |
| tree | 55a5dded7bd23a9e079a92de97c3c7628494b3a3 /src/machine | |
| parent | 65d73cf042ba7de11d254f5c4714f467db64b7c3 (diff) | |
logind,machined: various smaller cleanups
Use mfree() where we can.
Drop unnecessary {}.
Drop unnecessary variable declarations.
Cast syscall invocations where explicitly don't care for the return
value to (void).
Reword a comment.
Diffstat (limited to 'src/machine')
| -rw-r--r-- | src/machine/machine.c | 4 | ||||
| -rw-r--r-- | src/machine/machined-dbus.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/machine/machine.c b/src/machine/machine.c index ab26803683..4fd56a11ae 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -231,11 +231,11 @@ static void machine_unlink(Machine *m) { char *sl; sl = strjoina("/run/systemd/machines/unit:", m->unit); - unlink(sl); + (void) unlink(sl); } if (m->state_file) - unlink(m->state_file); + (void) unlink(m->state_file); } int machine_load(Machine *m) { diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c index b1f5aebe0c..49f41c62d7 100644 --- a/src/machine/machined-dbus.c +++ b/src/machine/machined-dbus.c @@ -1124,8 +1124,7 @@ int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *err return 0; if (streq_ptr(path, machine->scope_job)) { - free(machine->scope_job); - machine->scope_job = NULL; + machine->scope_job = mfree(machine->scope_job); if (machine->started) { if (streq(result, "done")) |