diff options
| author | Daniel Mack <github@zonque.org> | 2015-09-09 15:12:28 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-09-09 15:12:28 +0200 |
| commit | d7acddde057d25a4fb7835943ef3c73f262ba54f (patch) | |
| tree | cb6e0ab245a4ed43f1367b8164b8022f0e77fc13 /src/login | |
| parent | 02736a9abce02eb53b0d504f96fc7b3e4f077020 (diff) | |
| parent | 57255510c95ca3369d241502f26d7bbd8fac30a6 (diff) | |
Merge pull request #1216 from poettering/coccinelle-fixes-2
Coccinelle fixes 2
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/logind-session.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/login/logind-session.c b/src/login/logind-session.c index d2c5a29801..f5fe030b07 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -1005,22 +1005,25 @@ int session_prepare_vt(Session *s) { r = fchown(vt, s->user->uid, -1); if (r < 0) { - r = -errno; - log_error_errno(errno, "Cannot change owner of /dev/tty%u: %m", s->vtnr); + r = log_error_errno(errno, + "Cannot change owner of /dev/tty%u: %m", + s->vtnr); goto error; } r = ioctl(vt, KDSKBMODE, K_OFF); if (r < 0) { - r = -errno; - log_error_errno(errno, "Cannot set K_OFF on /dev/tty%u: %m", s->vtnr); + r = log_error_errno(errno, + "Cannot set K_OFF on /dev/tty%u: %m", + s->vtnr); goto error; } r = ioctl(vt, KDSETMODE, KD_GRAPHICS); if (r < 0) { - r = -errno; - log_error_errno(errno, "Cannot set KD_GRAPHICS on /dev/tty%u: %m", s->vtnr); + r = log_error_errno(errno, + "Cannot set KD_GRAPHICS on /dev/tty%u: %m", + s->vtnr); goto error; } @@ -1032,8 +1035,9 @@ int session_prepare_vt(Session *s) { mode.acqsig = SIGRTMIN + 1; r = ioctl(vt, VT_SETMODE, &mode); if (r < 0) { - r = -errno; - log_error_errno(errno, "Cannot set VT_PROCESS on /dev/tty%u: %m", s->vtnr); + r = log_error_errno(errno, + "Cannot set VT_PROCESS on /dev/tty%u: %m", + s->vtnr); goto error; } |