summaryrefslogtreecommitdiff
path: root/src/console
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2014-11-28 17:09:20 +0100
committerMichal Schmidt <mschmidt@redhat.com>2014-11-28 17:17:51 +0100
commitc33b329709ebe2755181980a050d02ec7c81ed87 (patch)
tree39080c428c72c90daddbe1c08d45c181adf1476c /src/console
parent5567fafbc9d83a1391f23ecdbe698a3c03929370 (diff)
treewide: more log_*_errno() conversions, multiline calls
Basically: find . -name '*.[ch]' | while read f; do perl -i.mmm -e \ 'local $/; local $_=<>; s/log_(debug|info|notice|warning|error|emergency)\("([^"]*)%s"([^;]*),\s*strerror\(-?([->a-zA-Z_]+)\)\);/log_\1_errno(\4, "\2%m"\3);/gms;print;' \ $f; done Plus manual indentation fixups.
Diffstat (limited to 'src/console')
-rw-r--r--src/console/consoled-manager.c12
-rw-r--r--src/console/consoled-session.c4
-rw-r--r--src/console/consoled-terminal.c3
3 files changed, 9 insertions, 10 deletions
diff --git a/src/console/consoled-manager.c b/src/console/consoled-manager.c
index 1b856f2228..0eac7ae78a 100644
--- a/src/console/consoled-manager.c
+++ b/src/console/consoled-manager.c
@@ -142,15 +142,15 @@ static int manager_sysview_session_add(Manager *m, sysview_event *event) {
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));
+ log_error_errno(r, "Cannot request session control on '%s': %m",
+ sysview_session_get_name(session));
return r;
}
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 +226,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;
diff --git a/src/console/consoled-session.c b/src/console/consoled-session.c
index c81bb306b7..927965e02c 100644
--- a/src/console/consoled-session.c
+++ b/src/console/consoled-session.c
@@ -106,8 +106,8 @@ static void session_grdev_fn(grdev_session *grdev, void *userdata, grdev_event *
r = display_new(&d, s, display);
if (r < 0) {
- log_error("Cannot create display '%s' on '%s': %s",
- grdev_display_get_name(display), sysview_session_get_name(s->sysview), strerror(-r));
+ log_error_errno(r, "Cannot create display '%s' on '%s': %m",
+ grdev_display_get_name(display), sysview_session_get_name(s->sysview));
break;
}
diff --git a/src/console/consoled-terminal.c b/src/console/consoled-terminal.c
index 166a43b5b1..755f23ece2 100644
--- a/src/console/consoled-terminal.c
+++ b/src/console/consoled-terminal.c
@@ -189,8 +189,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");
}
}