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/hibernate-resume/hibernate-resume-generator.c | 2 +- src/hibernate-resume/hibernate-resume.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/hibernate-resume') diff --git a/src/hibernate-resume/hibernate-resume-generator.c b/src/hibernate-resume/hibernate-resume-generator.c index 41f65d984e..a2768364ea 100644 --- a/src/hibernate-resume/hibernate-resume-generator.c +++ b/src/hibernate-resume/hibernate-resume-generator.c @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) { r = parse_proc_cmdline(parse_proc_cmdline_item); if (r < 0) - log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-r)); + log_warning_errno(-r, "Failed to parse kernel command line, ignoring: %m"); r = process_resume(); free(arg_resume_dev); diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c index b234a0b49a..262516e0f9 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/hibernate-resume/hibernate-resume.c @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) { r = write_string_file("/sys/power/resume", major_minor); if (r < 0) { - log_error("Failed to write '%s' to /sys/power/resume: %s", major_minor, strerror(-r)); + log_error_errno(-r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); return EXIT_FAILURE; } -- cgit v1.2.3-54-g00ecf