diff options
author | Michal Schmidt <mschmidt@redhat.com> | 2014-11-28 19:57:32 +0100 |
---|---|---|
committer | Michal Schmidt <mschmidt@redhat.com> | 2014-11-28 19:57:32 +0100 |
commit | 4a62c710b62a5a3c7a8a278b810b9d5b5a0c8f4f (patch) | |
tree | c7a6228e7151aa74bc8e331694a1e795226550cd /src/machine | |
parent | 56f64d95763a799ba4475daf44d8e9f72a1bd474 (diff) |
treewide: another round of simplifications
Using the same scripts as in f647962d64e "treewide: yet more log_*_errno
+ return simplifications".
Diffstat (limited to 'src/machine')
-rw-r--r-- | src/machine/machinectl.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 5ea4f4b0d9..f604263d8f 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -725,10 +725,8 @@ static int login_machine(sd_bus *bus, char **args, unsigned n) { return log_error_errno(master, "Failed to acquire pseudo tty: %m"); pty = ptsname(master); - if (!pty) { - log_error_errno(errno, "Failed to get pty name: %m"); - return -errno; - } + if (!pty) + return log_error_errno(errno, "Failed to get pty name: %m"); p = startswith(pty, "/dev/pts/"); if (!p) { @@ -744,10 +742,8 @@ static int login_machine(sd_bus *bus, char **args, unsigned n) { if (!getty) return log_oom(); - if (unlockpt(master) < 0) { - log_error_errno(errno, "Failed to unlock tty: %m"); - return -errno; - } + if (unlockpt(master) < 0) + return log_error_errno(errno, "Failed to unlock tty: %m"); r = sd_bus_call_method(container_bus, "org.freedesktop.systemd1", |