diff options
Diffstat (limited to 'src/shared/bus-util.h')
| -rw-r--r-- | src/shared/bus-util.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h index e0d4d5d915..00514e359f 100644 --- a/src/shared/bus-util.h +++ b/src/shared/bus-util.h @@ -39,22 +39,8 @@ int bus_connect_user_systemd(sd_bus **_bus); int bus_connect_transport(BusTransport transport, const char *host, bool user, sd_bus **bus); int bus_connect_transport_systemd(BusTransport transport, const char *host, bool user, sd_bus **bus); -#define bus_log_address_error(r) \ - ({ \ - int _k = (r); \ - log_error_errno(_k, \ - _k == -ENOMEDIUM ? "Failed to set bus address: $DBUS_SESSION_BUS_ADDRESS and $XDG_RUNTIME_DIR not defined (consider using --machine=<user>@.host --user to connect to bus of other user)" : \ - "Failed to set bus address: %m"); \ - }) - -#define bus_log_connect_error(r) \ - ({ \ - int _k = (r); \ - log_error_errno(_k, \ - _k == -ENOMEDIUM ? "Failed to connect to bus: $DBUS_SESSION_BUS_ADDRESS and $XDG_RUNTIME_DIR not defined (consider using --machine=<user>@.host --user to connect to bus of other user)" : \ - ERRNO_IS_PRIVILEGE(_k) ? "Failed to connect to bus: Operation not permitted (consider using --machine=<user>@.host --user to connect to bus of other user)" : \ - "Failed to connect to bus: %m"); \ - }) +int bus_log_address_error(int r, BusTransport transport); +int bus_log_connect_error(int r, BusTransport transport); #define bus_log_parse_error(r) \ log_error_errno(r, "Failed to parse bus message: %m") |