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/sysctl/sysctl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/sysctl') diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c index edebe501d1..2f73c32049 100644 --- a/src/sysctl/sysctl.c +++ b/src/sysctl/sysctl.c @@ -134,7 +134,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno 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; } @@ -196,7 +196,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno k = hashmap_put(sysctl_options, property, new_value); if (k < 0) { - log_error("Failed to add sysctl variable %s to hashmap: %s", property, strerror(-k)); + log_error_errno(-k, "Failed to add sysctl variable %s to hashmap: %m", property); free(property); free(new_value); return k; @@ -314,7 +314,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 sysctl.d files: %s", strerror(-r)); + log_error_errno(-r, "Failed to enumerate sysctl.d files: %m"); goto finish; } -- cgit v1.2.3-54-g00ecf