Remove src/compat-libs

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

diff --git a/src/console/consoled-terminal.c b/src/console/consoled-terminal.c
index d091579aa546e59f11aa5ad8f5c8ab4688c81e22..03447d1b9234bdc4b5591c5f71d7d66731b7c539 100644 (file)
--- a/src/console/consoled-terminal.c
+++ b/src/console/consoled-terminal.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <errno.h>
-#include <inttypes.h>
 #include <stdlib.h>
 #include "consoled.h"
 #include "list.h"
@@ -52,7 +51,7 @@ static int terminal_pty_fn(Pty *pty, void *userdata, unsigned int event, const v
         case PTY_DATA:
                 r = term_screen_feed_text(t->screen, ptr, size);
                 if (r < 0)
-                        log_error("Cannot update screen state: %s", strerror(-r));
+                        log_error_errno(r, "Cannot update screen state: %m");
 
                 workspace_dirty(t->workspace);
                 break;
@@ -99,7 +98,7 @@ Terminal *terminal_free(Terminal *t) {
         assert(t->workspace);
 
         if (t->pty) {
-                (void)pty_signal(t->pty, SIGHUP);
+                (void) pty_signal(t->pty, SIGHUP);
                 pty_close(t->pty);
                 pty_unref(t->pty);
         }
@@ -128,12 +127,12 @@ void terminal_resize(Terminal *t) {
         if (t->pty) {
                 r = pty_resize(t->pty, width, height);
                 if (r < 0)
-                        log_error("Cannot resize pty: %s", strerror(-r));
+                        log_error_errno(r, "Cannot resize pty: %m");
         }
 
         r = term_screen_resize(t->screen, width, height);
         if (r < 0)
-                log_error("Cannot resize screen: %s", strerror(-r));
+                log_error_errno(r, "Cannot resize screen: %m");
 }
 
 void terminal_run(Terminal *t) {
@@ -151,7 +150,7 @@ void terminal_run(Terminal *t) {
                        term_screen_get_width(t->screen),
                        term_screen_get_height(t->screen));
         if (pid < 0) {
-                log_error("Cannot fork PTY: %s", strerror(-pid));
+                log_error_errno(pid, "Cannot fork PTY: %m");
                 return;
         } else if (pid == 0) {
                 /* child */
@@ -165,7 +164,7 @@ void terminal_run(Terminal *t) {
                 setenv("COLORTERM", "systemd-console", 1);
 
                 execve(argv[0], argv, environ);
-                log_error("Cannot exec %s (%d): %m", argv[0], -errno);
+                log_error_errno(errno, "Cannot exec %s (%d): %m", argv[0], -errno);
                 _exit(1);
         }
 }
@@ -189,8 +188,7 @@ static void terminal_feed_keyboard(Terminal *t, idev_data *data) {
                                               kdata->codepoints,
                                               kdata->mods);
                 if (r < 0)
-                        log_error("Cannot feed keyboard data to screen: %s",
-                                  strerror(-r));
+                        log_error_errno(r, "Cannot feed keyboard data to screen: %m");
         }
 }