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/cgtop/cgtop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/cgtop') diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c index 932a7ba7c6..79592aaa17 100644 --- a/src/cgtop/cgtop.c +++ b/src/cgtop/cgtop.c @@ -748,7 +748,7 @@ int main(int argc, char *argv[]) { if (r == -ETIMEDOUT) continue; if (r < 0) { - log_error("Couldn't read key: %s", strerror(-r)); + log_error_errno(-r, "Couldn't read key: %m"); goto finish; } } @@ -842,7 +842,7 @@ finish: group_hashmap_free(b); if (r < 0) { - log_error("Exiting with failure: %s", strerror(-r)); + log_error_errno(-r, "Exiting with failure: %m"); return EXIT_FAILURE; } -- cgit v1.2.3-54-g00ecf