From 449101fce2757575c4813a9512890536365445f6 Mon Sep 17 00:00:00 2001 From: Simon Peeters Date: Thu, 11 Apr 2013 00:39:01 +0200 Subject: Move bus_error to dbus-common and remove bus_error_message_or_strerror bus_error and bus_error_message_or_strerror dit almost exactly the same, so use only one of them and place it in dbus-common. --- src/shared/dbus-common.c | 5 ++--- src/shared/dbus-common.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/shared') diff --git a/src/shared/dbus-common.c b/src/shared/dbus-common.c index 5afce7627a..b8c15cb9fc 100644 --- a/src/shared/dbus-common.c +++ b/src/shared/dbus-common.c @@ -258,12 +258,11 @@ const char *bus_error_message(const DBusError *error) { return error->message; } -const char *bus_error_message_or_strerror(const DBusError *error, int err) { - +const char *bus_error(const DBusError *error, int err) { if (error && dbus_error_is_set(error)) return bus_error_message(error); - return strerror(err); + return strerror(err < 0 ? -err : err); } DBusHandlerResult bus_default_message_handler( diff --git a/src/shared/dbus-common.h b/src/shared/dbus-common.h index f7f614cdcd..16fc14b8e4 100644 --- a/src/shared/dbus-common.h +++ b/src/shared/dbus-common.h @@ -92,7 +92,7 @@ int bus_connect_system_ssh(const char *user, const char *host, DBusConnection ** int bus_connect_system_polkit(DBusConnection **_bus, DBusError *error); const char *bus_error_message(const DBusError *error); -const char *bus_error_message_or_strerror(const DBusError *error, int err); +const char *bus_error(const DBusError *e, int r); typedef int (*BusPropertyCallback)(DBusMessageIter *iter, const char *property, void *data); typedef int (*BusPropertySetCallback)(DBusMessageIter *iter, const char *property, void *data); -- cgit v1.2.3-54-g00ecf