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/binfmt/binfmt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/binfmt') diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c index 0a15fafc60..ca650fb009 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c @@ -65,7 +65,7 @@ static int apply_rule(const char *rule) { r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule); if (r < 0) { - log_error("Failed to add binary format: %s", strerror(-r)); + log_error_errno(-r, "Failed to add binary format: %m"); return r; } @@ -83,7 +83,7 @@ static int apply_file(const char *path, bool ignore_enoent) { if (ignore_enoent && r == -ENOENT) return 0; - log_error("Failed to open file '%s', ignoring: %s", path, strerror(-r)); + log_error_errno(-r, "Failed to open file '%s', ignoring: %m", path); return r; } @@ -191,7 +191,7 @@ int main(int argc, char *argv[]) { r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs); if (r < 0) { - log_error("Failed to enumerate binfmt.d files: %s", strerror(-r)); + log_error_errno(-r, "Failed to enumerate binfmt.d files: %m"); goto finish; } -- cgit v1.2.3-54-g00ecf