X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fdbus-common.c;h=b8c15cb9fc35e9fbdd046db32805a786b3a9e92e;hb=1210bc667d2d133814a0eb3cbcfcfb7e721fba9f;hp=5afce7627ae7db87b6b3ff33752cc3c3f9d1240e;hpb=2fa4092c2829dd14e50c430ae2f23551d23c6c1d;p=elogind.git diff --git a/src/shared/dbus-common.c b/src/shared/dbus-common.c index 5afce7627..b8c15cb9f 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(