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/dbus1-generator/dbus1-generator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/dbus1-generator/dbus1-generator.c') diff --git a/src/dbus1-generator/dbus1-generator.c b/src/dbus1-generator/dbus1-generator.c index 57af80c0e..4ba1ad131 100644 --- a/src/dbus1-generator/dbus1-generator.c +++ b/src/dbus1-generator/dbus1-generator.c @@ -103,7 +103,7 @@ static int create_dbus_files( r = fflush_and_check(f); if (r < 0) { - log_error("Failed to write %s: %s", a, strerror(-r)); + log_error_errno(-r, "Failed to write %s: %m", a); return r; } @@ -140,7 +140,7 @@ static int create_dbus_files( r = fflush_and_check(f); if (r < 0) { - log_error("Failed to write %s: %s", b, strerror(-r)); + log_error_errno(-r, "Failed to write %s: %m", b); return r; } @@ -332,7 +332,7 @@ int main(int argc, char *argv[]) { type = "system"; units = SYSTEM_DATA_UNIT_PATH; } else { - log_error("Failed to determine whether we are running as user or system instance: %s", strerror(-r)); + log_error_errno(-r, "Failed to determine whether we are running as user or system instance: %m"); return r; } -- cgit v1.2.3