X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-terminal%2Fmodeset.c;h=6e13432d688fb7709a86d48590f6e512ce0157b6;hb=efd51554aea0f226a7f6704a72aa6a3c9fc6cb2f;hp=9871e306e4f0ee795072b2ebaf5c87b1fd757855;hpb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;p=elogind.git

diff --git a/src/libsystemd-terminal/modeset.c b/src/libsystemd-terminal/modeset.c
index 9871e306e..6e13432d6 100644
--- a/src/libsystemd-terminal/modeset.c
+++ b/src/libsystemd-terminal/modeset.c
@@ -146,16 +146,12 @@ static int modeset_new(Modeset **out) {
                 return log_oom();
 
         r = sd_pid_get_session(getpid(), &m->session);
-        if (r < 0) {
-                log_error_errno(-r, "Cannot retrieve logind session: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Cannot retrieve logind session: %m");
 
         r = sd_session_get_seat(m->session, &m->seat);
-        if (r < 0) {
-                log_error_errno(-r, "Cannot retrieve seat of logind session: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Cannot retrieve seat of logind session: %m");
 
         m->my_tty = is_my_tty(m->session);
         m->managed = m->my_tty && geteuid() > 0;
@@ -309,17 +305,13 @@ static int modeset_sysview_fn(sysview_context *c, void *userdata, sysview_event
                                       name,
                                       modeset_grdev_fn,
                                       m);
-                if (r < 0) {
-                        log_error_errno(-r, "Cannot create grdev session: %m");
-                        return r;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "Cannot create grdev session: %m");
 
                 if (m->managed) {
                         r = sysview_session_take_control(ev->session_add.session);
-                        if (r < 0) {
-                                log_error_errno(-r, "Cannot request session control: %m");
-                                return r;
-                        }
+                        if (r < 0)
+                                return log_error_errno(r, "Cannot request session control: %m");
                 }
 
                 grdev_session_enable(m->grdev_session);
@@ -358,16 +350,12 @@ static int modeset_sysview_fn(sysview_context *c, void *userdata, sysview_event
                 break;
         case SYSVIEW_EVENT_SESSION_CONTROL:
                 r = ev->session_control.error;
-                if (r < 0) {
-                        log_error_errno(-r, "Cannot acquire session control: %m");
-                        return r;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "Cannot acquire session control: %m");
 
                 r = ioctl(1, KDSKBMODE, K_UNICODE);
-                if (r < 0) {
-                        log_error("Cannot set K_UNICODE on stdout: %m");
-                        return -errno;
-                }
+                if (r < 0)
+                        return log_error_errno(errno, "Cannot set K_UNICODE on stdout: %m");
 
                 break;
         }