chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove duplicated includes
[elogind.git]
/
src
/
machine
/
machinectl.c
diff --git
a/src/machine/machinectl.c
b/src/machine/machinectl.c
index 5ea4f4b0d9c0b136d2e98dc3c07062ad648e1477..f604263d8f2cfd8c7a991144776924c84e4e139c 100644
(file)
--- 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);
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) {
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 (!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",
r = sd_bus_call_method(container_bus,
"org.freedesktop.systemd1",