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/backlight/backlight.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/backlight/backlight.c') diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c index 0a2bac6f16..ab05a7d1a7 100644 --- a/src/backlight/backlight.c +++ b/src/backlight/backlight.c @@ -211,7 +211,7 @@ static unsigned get_max_brightness(struct udev_device *device) { r = safe_atou(max_brightness_str, &max_brightness); if (r < 0) { - log_warning("Failed to parse 'max_brightness' \"%s\": %s", max_brightness_str, strerror(-r)); + log_warning_errno(-r, "Failed to parse 'max_brightness' \"%s\": %m", max_brightness_str); return 0; } @@ -235,7 +235,7 @@ static void clamp_brightness(struct udev_device *device, char **value, unsigned r = safe_atou(*value, &brightness); if (r < 0) { - log_warning("Failed to parse brightness \"%s\": %s", *value, strerror(-r)); + log_warning_errno(-r, "Failed to parse brightness \"%s\": %m", *value); return; } @@ -387,7 +387,7 @@ int main(int argc, char *argv[]) { if (r == -ENOENT) return EXIT_SUCCESS; - log_error("Failed to read %s: %s", saved, strerror(-r)); + log_error_errno(-r, "Failed to read %s: %m", saved); return EXIT_FAILURE; } @@ -416,7 +416,7 @@ int main(int argc, char *argv[]) { r = write_string_file(saved, value); if (r < 0) { - log_error("Failed to write %s: %s", saved, strerror(-r)); + log_error_errno(-r, "Failed to write %s: %m", saved); return EXIT_FAILURE; } -- cgit v1.2.3-54-g00ecf