From 1bc3e1d51368f8e9ac845da530e6f78365201629 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 16 Sep 2015 17:47:09 +0200 Subject: [PATCH] systemd: fix systemd logging statements to show "file:line (func)" properly Previously, we would stringify the arguments, resulting in logging lines like "__FILE__:__LINE__(__PRETTY_FUNCTION__): assert return: ..." --- src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h b/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h index f8856a1bd7..34f73510fe 100644 --- a/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h +++ b/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h @@ -75,18 +75,20 @@ G_STMT_START { \ #define log_assert_failed(e, file, line, func) \ G_STMT_START { \ - nm_log_err (LOGD_DHCP, #file ":" #line "(" #func "): assertion failed: " # e); \ + nm_log_err (LOGD_DHCP, "%s:%d (%s): assertion failed: %s", (""file), (line), (func), G_STRINGIFY (e)); \ g_assert (FALSE); \ } G_STMT_END #define log_assert_failed_unreachable(t, file, line, func) \ G_STMT_START { \ - nm_log_err (LOGD_DHCP, #file ":" #line "(" #func "): assert unreachable: " # t); \ + nm_log_err (LOGD_DHCP, "%s:%d (%s): assert unreachable: %s", (""file), (line), (func), G_STRINGIFY (t)); \ g_assert_not_reached (); \ } G_STMT_END #define log_assert_failed_return(e, file, line, func) \ - nm_log_err (LOGD_DHCP, #file ":" #line "(" #func "): assert return: " # e); \ +G_STMT_START { \ + nm_log_err (LOGD_DHCP, "%s:%d (%s): assert return: %s", (""file), (line), (func), G_STRINGIFY (e)); \ +} G_STMT_END #define log_oom nm_log_err(LOGD_CORE, "%s:%s/%s: OOM", __FILE__, __LINE__, __func__)