From 0a1beeb64207eaa88ab9236787b1cbc2f704ae14 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 28 Nov 2014 11:58:34 +0100 Subject: 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(). --- src/core/device.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/core/device.c') diff --git a/src/core/device.c b/src/core/device.c index 068578dc82..42e3a261e2 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -334,7 +334,7 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p return 0; fail: - log_warning("Failed to load device unit: %s", strerror(-r)); + log_warning_errno(-r, "Failed to load device unit: %m"); if (delete && u) unit_free(u); @@ -650,20 +650,20 @@ static int device_dispatch_io(sd_event_source *source, int fd, uint32_t revents, if (streq(action, "remove") || !device_is_ready(dev)) { r = device_process_removed_device(m, dev); if (r < 0) - log_error("Failed to process device remove event: %s", strerror(-r)); + log_error_errno(-r, "Failed to process device remove event: %m"); r = swap_process_removed_device(m, dev); if (r < 0) - log_error("Failed to process swap device remove event: %s", strerror(-r)); + log_error_errno(-r, "Failed to process swap device remove event: %m"); } else { r = device_process_new_device(m, dev); if (r < 0) - log_error("Failed to process device new event: %s", strerror(-r)); + log_error_errno(-r, "Failed to process device new event: %m"); r = swap_process_new_device(m, dev); if (r < 0) - log_error("Failed to process swap device new event: %s", strerror(-r)); + log_error_errno(-r, "Failed to process swap device new event: %m"); manager_dispatch_load_queue(m); -- cgit v1.2.3-54-g00ecf