summaryrefslogtreecommitdiff
path: root/src/console
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2014-11-28 11:58:34 +0100
committerMichal Schmidt <mschmidt@redhat.com>2014-11-28 12:04:41 +0100
commit0a1beeb64207eaa88ab9236787b1cbc2f704ae14 (patch)
tree50117277be2e2078d0373b944a30b4f09bb94443 /src/console
parentb4d23205f238e06aaa31264628e20669e714acad (diff)
treewide: auto-convert the simple cases to log_*_errno()
As a followup to 086891e5c1 "log: add an "error" parameter to all low-level logging calls and intrdouce log_error_errno() as log calls that take error numbers", use sed to convert the simple cases to use the new macros: find . -name '*.[ch]' | xargs sed -r -i -e \ 's/log_(debug|info|notice|warning|error|emergency)\("(.*)%s"(.*), strerror\(-([a-zA-Z_]+)\)\);/log_\1_errno(-\4, "\2%m"\3);/' Multi-line log_*() invocations are not covered. And we also should add log_unit_*_errno().
Diffstat (limited to 'src/console')
-rw-r--r--src/console/consoled-session.c2
-rw-r--r--src/console/consoled-terminal.c8
-rw-r--r--src/console/consoled.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/console/consoled-session.c b/src/console/consoled-session.c
index 8bacacab35..abdb1bc481 100644
--- a/src/console/consoled-session.c
+++ b/src/console/consoled-session.c
@@ -231,7 +231,7 @@ void session_dirty(Session *s) {
r = sd_event_source_set_enabled(s->redraw_src, SD_EVENT_ONESHOT);
if (r < 0)
- log_error("Cannot enable redraw-source: %s", strerror(-r));
+ log_error_errno(-r, "Cannot enable redraw-source: %m");
}
void session_add_device(Session *s, sysview_device *device) {
diff --git a/src/console/consoled-terminal.c b/src/console/consoled-terminal.c
index d091579aa5..7d0f646c7e 100644
--- a/src/console/consoled-terminal.c
+++ b/src/console/consoled-terminal.c
@@ -52,7 +52,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;
@@ -128,12 +128,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 +151,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 */
diff --git a/src/console/consoled.c b/src/console/consoled.c
index b0c9eda1ac..f76a357c97 100644
--- a/src/console/consoled.c
+++ b/src/console/consoled.c
@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
r = manager_new(&m);
if (r < 0) {
- log_error("Could not create manager: %s", strerror(-r));
+ log_error_errno(-r, "Could not create manager: %m");
goto out;
}
@@ -55,7 +55,7 @@ int main(int argc, char *argv[]) {
r = manager_run(m);
if (r < 0) {
- log_error("Cannot run manager: %s", strerror(-r));
+ log_error_errno(-r, "Cannot run manager: %m");
goto out;
}