From 32131a3aaad8f2102698fbd66a308d1d3e500da6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 28 Jul 2019 11:43:53 +0200 Subject: [PATCH] bus-util: convert bus_log_{parse,create}_error into defines With SYSTEMD_LOG_LOCATION=1, it is much more useful to see the location where the call to bus_log_{parse,create}_error() was made, rather then the one-line body of the helper function. Also, it's our internal code, so having a one-line non-inline function doesn't make much sense anyway. --- src/shared/bus-util.c | 8 -------- src/shared/bus-util.h | 7 +++++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 8e301250bc..6af115e7aa 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -1480,14 +1480,6 @@ int bus_property_get_ulong( } #endif -int bus_log_parse_error(int r) { - return log_error_errno(r, "Failed to parse bus message: %m"); -} - -int bus_log_create_error(int r) { - return log_error_errno(r, "Failed to create bus message: %m"); -} - /** * bus_path_encode_unique() - encode unique object path * @b: bus connection or NULL diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h index 3216b0c37a..1e2f04cc5d 100644 --- a/src/shared/bus-util.h +++ b/src/shared/bus-util.h @@ -114,8 +114,11 @@ assert_cc(sizeof(pid_t) == sizeof(uint32_t)); assert_cc(sizeof(mode_t) == sizeof(uint32_t)); #define bus_property_get_mode ((sd_bus_property_get_t) NULL) -int bus_log_parse_error(int r); -int bus_log_create_error(int r); +#define bus_log_parse_error(r) \ + log_error_errno(r, "Failed to parse bus message: %m") + +#define bus_log_create_error(r) \ + log_error_errno(r, "Failed to create bus message: %m") #define BUS_DEFINE_PROPERTY_GET_GLOBAL(function, bus_type, val) \ int function(sd_bus *bus, \ -- 2.25.1