Move DEFINE_TRIVIAL_CLEANUP_FUNC to macro.h

[elogind.git] / src / console / consoled-manager.c

diff --git a/src/console/consoled-manager.c b/src/console/consoled-manager.c
index 8f3823fe469766134f72e4f12e2b6d06d479b317..9dd62f04a09d83c4b741ba0350805f09882195c9 100644 (file)
--- a/src/console/consoled-manager.c
+++ b/src/console/consoled-manager.c
@@ -132,7 +132,7 @@ static int manager_sysview_session_filter(Manager *m, sysview_event *event) {
         if (r < 0)
                 return 0;
 
-        return streq(desktop, "SYSTEMD-CONSOLE");
+        return streq(desktop, "systemd-console");
 }
 
 static int manager_sysview_session_add(Manager *m, sysview_event *event) {
@@ -141,16 +141,14 @@ static int manager_sysview_session_add(Manager *m, sysview_event *event) {
         int r;
 
         r = sysview_session_take_control(session);
-        if (r < 0) {
-                log_error("Cannot request session control on '%s': %s",
-                          sysview_session_get_name(session), strerror(-r));
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Cannot request session control on '%s': %m",
+                                       sysview_session_get_name(session));
 
         r = session_new(&s, m, session);
         if (r < 0) {
-                log_error("Cannot create session on '%s': %s",
-                          sysview_session_get_name(session), strerror(-r));
+                log_error_errno(r, "Cannot create session on '%s': %m",
+                                sysview_session_get_name(session));
                 sysview_session_release_control(session);
                 return r;
         }
@@ -226,8 +224,8 @@ static int manager_sysview_session_control(Manager *m, sysview_event *event) {
                 return 0;
 
         if (error < 0) {
-                log_error("Cannot take session control on '%s': %s",
-                          sysview_session_get_name(session), strerror(-error));
+                log_error_errno(error, "Cannot take session control on '%s': %m",
+                                sysview_session_get_name(session));
                 session_free(s);
                 sysview_session_set_userdata(session, NULL);
                 return -error;