diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2014-11-28 11:58:34 +0100 |
|---|---|---|
| committer | Michal Schmidt <mschmidt@redhat.com> | 2014-11-28 12:04:41 +0100 |
| commit | 0a1beeb64207eaa88ab9236787b1cbc2f704ae14 (patch) | |
| tree | 50117277be2e2078d0373b944a30b4f09bb94443 /src/libsystemd/sd-event | |
| parent | b4d23205f238e06aaa31264628e20669e714acad (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/libsystemd/sd-event')
| -rw-r--r-- | src/libsystemd/sd-event/sd-event.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index fb436adc13..993ef202de 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -2158,9 +2158,9 @@ static int source_dispatch(sd_event_source *s) { if (r < 0) { if (s->description) - log_debug("Event source '%s' returned error, disabling: %s", s->description, strerror(-r)); + log_debug_errno(-r, "Event source '%s' returned error, disabling: %m", s->description); else - log_debug("Event source %p returned error, disabling: %s", s, strerror(-r)); + log_debug_errno(-r, "Event source %p returned error, disabling: %m", s); } if (s->n_ref == 0) @@ -2196,9 +2196,9 @@ static int event_prepare(sd_event *e) { if (r < 0) { if (s->description) - log_debug("Prepare callback of event source '%s' returned error, disabling: %s", s->description, strerror(-r)); + log_debug_errno(-r, "Prepare callback of event source '%s' returned error, disabling: %m", s->description); else - log_debug("Prepare callback of event source %p returned error, disabling: %s", s, strerror(-r)); + log_debug_errno(-r, "Prepare callback of event source %p returned error, disabling: %m", s); } if (s->n_ref == 0) |