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/machine/machine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/machine/machine.c') diff --git a/src/machine/machine.c b/src/machine/machine.c index a6d636ea49..88c10b7315 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -216,7 +216,7 @@ finish: if (temp_path) unlink(temp_path); - log_error("Failed to save machine data %s: %s", m->state_file, strerror(-r)); + log_error_errno(-r, "Failed to save machine data %s: %m", m->state_file); } return r; @@ -259,7 +259,7 @@ int machine_load(Machine *m) { if (r == -ENOENT) return 0; - log_error("Failed to read %s: %s", m->state_file, strerror(-r)); + log_error_errno(-r, "Failed to read %s: %m", m->state_file); return r; } -- cgit v1.2.3-54-g00ecf