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/shared/socket-label.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/shared/socket-label.c') diff --git a/src/shared/socket-label.c b/src/shared/socket-label.c index 47d9488d56..b0fca9b45c 100644 --- a/src/shared/socket-label.c +++ b/src/shared/socket-label.c @@ -162,12 +162,12 @@ int make_socket_fd(int log_level, const char* address, int flags) { r = socket_address_print(&a, &p); if (r < 0) { - log_error("socket_address_print(): %s", strerror(-r)); + log_error_errno(-r, "socket_address_print(): %m"); return r; } if (fd < 0) - log_error("Failed to listen on %s: %s", p, strerror(-fd)); + log_error_errno(-fd, "Failed to listen on %s: %m", p); else log_full(log_level, "Listening on %s", p); } -- cgit v1.2.3-54-g00ecf