chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hashmap: document trivial_hash_func()
[elogind.git]
/
src
/
shared
/
dbus-common.c
diff --git
a/src/shared/dbus-common.c
b/src/shared/dbus-common.c
index 5afce7627ae7db87b6b3ff33752cc3c3f9d1240e..b8c15cb9fc35e9fbdd046db32805a786b3a9e92e 100644
(file)
--- 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;
}
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);
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(
}
DBusHandlerResult bus_default_message_handler(