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/fstab-generator/fstab-generator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/fstab-generator') diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 14e664236e..1863ab8e89 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -134,7 +134,7 @@ static int add_swap( r = fflush_and_check(f); if (r < 0) { - log_error("Failed to write unit file %s: %s", unit, strerror(-r)); + log_error_errno(-r, "Failed to write unit file %s: %m", unit); return r; } @@ -600,7 +600,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"); /* Always honour root= and usr= in the kernel command line if we are in an initrd */ if (in_initrd()) { -- cgit v1.2.3-54-g00ecf